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