Merge branch 'ch/new-gpg-drops-rfc-1991' into maint