Issue #16546: merge fix from 3.3