Merge branch 'mg/gpg-fingerprint'