SONAR-5333 Some changes