Merge "UserManager as role coordinator"