Issue #22668: Merge from 3.4.