Issue #14701: Merge fix from 3.2.