Merge branch 'nd/config-blame-sort'