Merge "Fix ssh timeout issue"