Merge "Split message aggregators"