Merge branch 'cb/credential-doc-fixes'