Issue #25717: Merge fstat() fix from 3.5