Merge branch 'mm/maint-sort-config-doc' into maint