Refs #2887 - Fix an wrong merge from branch 2.4 to 2.3
Merge branch 'branches/rudder/2.4'

* branches/rudder/2.4:
  Refs #2887 - Fix an wrong merge from branch 2.4 to 2.3