Merge "Fix GroupMembershipManager implementation again." into main