Issue #21088: Merge from 3.4.