Merge branch 'jk/doc-credential-helper'