Merge branch 'jn/credential-doc-on-clear'