Merge branch 'as/doc-markup-fix'