Merge branch 'sb/gpg-plug-fd-leak' into maint