Sonar SCM changes