support for asynchronous Aggregator calls
Merge branch 'develop'