Refs #2887 - Fix an wrong merge from branch 2.4 to 2.3