SONAR-5718 Add issues MT
SONAR-5718 Feedback applied