am 74aba614: Allow additional vendors

* commit '74aba61404f0c1ea8693d2959d81d8b5b1bdf5d4':
  Allow additional vendors