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