Issue #16096: Merge fixes from 3.3.