Merge branch 'kk/maint-for-each-ref-multi-sort'