Merge "Switch to use new base_client.BaseClient"