Squashing all changes in one PR from OC6_User_Management branch

@DeepDiver1975 All the changes in #3634 as one PR as discussed on IRC. Two thumbs up and this is in. :)