Issue #21092: Merge from 3.4.