SONAR-5207 Different enhancements