Merge branch 'nd/qsort-in-merge-recursive' into maint