Merge pull request #521 from peternewman/e1.37-2

Cherry pick some more tweaks to reduce the change further.
Separate out some of the non-USB changes for easy review.
Merge pull request #522 from nomis52/master

Separate out some of the non-USB changes for easy review.