Merge branch 'develop' into bugfix/remove-exception-on-wrong-sort-field

10 jobs for bugfix/remove-exception-on-wrong-sort-field in 4 minutes and 18 seconds (queued for 2 seconds)