Merge "Add roles to user"