Merge changes from topic "mpietal_supervised_user"

* changes:
  User switcher - Manage users
  Add supervised user support