Merge pull request #3555 from nikil/aggregate