Merge branch 'is_member_of_roles'.