Merge branch 'xf/user-manual-markup' into maint