Merge "Changed ssh transport options"