Merge remote-tracking branch 'kraxel/usb.17' into staging