SONAR-5872 Apply feedback