Merge branch 'ad/ssh-signing-testfix'