Issue #14245: Merge changes from 3.2.