Merge branch 'sg/gpg-tests-fix'