robust timeout handling
Merge commit '9694404'