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