SONAR-5877 Return back the issue underline