Updated aggregation strategy and improved unit tests.
Merge remote-tracking branch 'origin/scatter-gather'