Merge "CTS: Partial buckets work on config update" into pi-dev