SONAR-5209 Issues performance