Merge fix for #16489 from 3.3