Issue #4209: merge error, missing import