Reimplement gson1703/master changes, however removed the USB warning outputs