Merge branch 'jc/gpg-lazy-init'