Issue #14152: Merge fix from 3.2.