GroupClient method addition
One big commit for T6