Add a sort assertion in case options are missing
Merge branch 'trunk'