Merge branch 'tm/tag-gpgsign-config'