[DF-5118], fix for aggregator controls.