Merge "Fixes for handling users + default for USB" into oc-dev