Issue #25940: Merge ETIMEDOUT fix from 3.2 into 3.3