Added support for multiple measures in the aggregator
Merge remote-tracking branch 'origin/build-process' into build-process