SONAR-5389 Analyzer optimizer