csboling Merge branch 'feature/usb-json' into csboling-dev