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