Issue #14018: merge