Merge "Use Tempest-lib's aggregate client"