Merge branch 'dd/t6300-wo-gpg-fix' into maint