Merge "Updated aggregator configs to recent changes"