Merge branch 'bd/qsort'