Issue #13861: merge