Merge branch 'jk/doc-credential-helper' into maint