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