Merge remote-tracking branch 'origin/separated-aggregator' into separated-aggregator