Merge branch 'ma/config-doc-update'