Issue #15533: Merge fix from 3.2.