SONAR-3513 Feedback applied