SONAR-4466 Fixed quality issue