Refactored to use scatter-gather aggregation strategy
Merge remote-tracking branch 'origin/scatter-gather'