Committing the sonar changes (1)