Correct merge for refs #3495
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5