MAR-1 - Refactor CDS handling in aggregation functions so common code can be reused
Merge remote-tracking branch 'origin/develop' into develop