Merge branch 'ma/reset-doc-rendering-fix'