SONAR-5209 Fix issue comments