Merge "Refactor GroupMembersFactory"