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