Merge "RoleManager changes"