Task #354147
fix sonar bug