SONAR-5209 Fix regressions