Issue #5421: merge fix