Merge "Improve timeouts in MultiHttpClient"