Issue #25270: Merge from 3.5