Merge "Fix ssh proxy regression"