Issue #10197: merge heads