RESYNC BRANCH w/ fix_user

This commits is essentially a hand merge from the fix-user branch.
Done to correct a bunch of messed up merges