Issue #25924: merge with 3.5