Merge branch 'rs/qsort'