SONAR-3858 - Fixed quality issue