Merge "Remove the ConnectTimeoutException"