SONAR-5209 Some changes