Merge branch 'rs/ssh-signing-fix'