Merge branch 'tz/gpg-test-fix'