Issue #25798: merge from 3.4