CRAFTERCMS-81: Sonar integration