MAR-1 - Fix aggregation for legacy vanilla cds
Merge remote-tracking branch 'origin/develop' into develop