SONAR-5209 Feedback applied