Issue #25221: merge from 3.5.