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