Issue #16340: Merged fix from 3.3.