Merge branch 'release/5.0.5' into develop
more errors
Working on sort
Fix sorting, fix tests
Update version
Merge branch 'release/6.0.0'