Merge branch 'sm/branch-sort-config'