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