Merge change 2122 into donut

* changes:
  Add support for USB Vendor ID in the add-ons.