SONAR-5607 Apply feedback