Merge "Change 'Member' role reference to 'member'"