Merge branch 'as/config-doc-markup-fix'