Merge branch 'bt/gpg-interface'