Issue #14184: merge