SONAR-3113 Apply David's feedback