Merge branch 'mm/clean-doc-fix' into maint