PLAT-3308 - Handle CDS Indexes in aggregation functions
Merge remote-tracking branch 'origin/develop' into develop