Issue #14197: merge