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