Merge branch 'sg/gpg-sig'