Sorting criteria in a scenario before running.
Merge branch 'master' into release