Merge branch 'vendor-ids'