Merge branch 'ssh-fixes' into 'develop'