Issue #16305: Merge fix from 3.3.