Issue #16015: Merge fix from 3.2.