SONAR-5884 Apply feedback