Issue #14741: Merge fix from 3.2.