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