SONAR-4463 Fixed quality issues