Issue #21226: Merge from 3.4.