Task #354591
Fix sonar bug