Merge remote-tracking branch 'burton/aggregator'