#JC-1254. Fixed sonar violations