Merge changes from topic 'aggregate-sonar'