Merge "Make v3 identity_client consistent"