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