Issue #14962: merge