Merge branch 'usb-audio-midi' into develop