Issue #4209: merge error, missing import
Merge branch 'branches/rudder/2.8' into branches/rudder/2.9