Merge branch 'usb_fix' into hydro-devel