tamird Merge pull request #12838 from tamird/fix-vendor …