Merge pull request #8007 from ryzhovau/aggregate_flags