Issue #25034: Merge from 3.4.