Merge "Increase default timeout"