Merge "Add supervised user support"