Merge branch 'dz/credential-doc-url-matching-rules'