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