Follow changes in Sonar 3.6