Merge "Make aggregates_client use **kwargs"