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