Merge branch 'hi/gpg-use-check-signature'