Merge "Move base_client from volume.v3 to volume"