Merge branch 'rs/qsort-s'