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