Add connection and request timeout handling
Merge branch 'timeouts' into sandbox