Merge "openssh client fix"