SONAR-5209 Remove number of FP issues