Merged features/inband-usb -r6431:8293 into trunk.