Issue #14167: merge fix from 3.2 branch.