Issue #11852: Merge fix from 3.2.