SONAR-5389 Feedback from Simon