Merge "use new setting flag to switch between current and new aggregator."