Merge branch 'hi/gpg-optional-pkfp-fix'