SONAR-5007 Feedback applied