Merge branch 'ta/doc-config'