SONAR-5010 fix merge