VIDEO-13 fix sonar critical violations