Merge branch 'topic/usb-endpoint' into topic/misc