Merge "fix ssh tunnel creation"