am ffbef646: am 74aba614: Allow additional vendors

* commit 'ffbef646d2bec4f84874bdc5940c3b060904cb3d':
  Allow additional vendors