Merge branch 'jk/gpg-interface-cleanup'