Merge branch 'wk/merge-options-gpg-sign-doc'