SONAR-3113 Apply David feedback