Merge "Remove RoleManager and RoleContext"