Issue #16348: merge fix from 3.2.