10 Commits (hotfix_vendor_indexerror)