Merge changes from topic 'sonar-cleanup'