Merge branch 'fix/9493_sorting' into 'development'

Fix/9493 sorting

See merge request !10
5 jobs for development in 51 seconds (queued for 3 seconds)