Fix sorting, fix tests
Update version
Merge branch 'release/6.0.0' into develop