Merge branch 'dn/gpg-doc'