Fixes #3551: restablish line missed out from merge 7b83915c8db2487dee3c52d3acf7b7d6e14ae3d8
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5
Merge branch 'branches/rudder/2.5'