SONAR-5623 Apply feedback