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