SONAR-5169 Apply feedback