SONAR-4884 Initial integration