Issue #16402: Merge fix from 3.2