SONAR-5845 Feedback applied
Fix duplication markers