Merge remote-tracking branch 'origin/bugfix/7330-disable-gnome-keyring-gpg-functionality' into testing