Issue #10881: merge