Issue #21906: Merge from 3.4.