Merge "[V3] Make endpoints_client use **kwargs"