Issue #25717: Merge comment from 3.5