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