Merge branch 'ma/user-manual-markup-update'