Issue #15477: Merge fix from 3.2