Merge branch 'bc/gpg-verify-raw'