Merge "Make 2 base_snapshots_client function use **kwargs"