Merge branch 'usb-gadget' into develop