Issue #14697:  Merge fix from 3.2.