Merge branch 'bc/doc-credential-helper-value'