Issue #25940: Merge ETIMEDOUT fix from 3.3 into 3.4