Improved user handling.
Merge branch 'test' into dev