Code

Merge branch 'mm/sort-config-doc'