SONAR-4851 4th feedback changes