Issue #21629: Merge from 3.4.