Slow analysis after SonarQube upgrade

Another update: