Merge "SSH connection related cleanups"