Merge branch 'ca/doc-config-third-party'