Merge "[V3] Separating groups_client from identity_client"