SONAR-4884 2nd feedback