Test for sorting options
Merge branch 'master' into develop