Merge branch 'hotfix/sorting-and-grouping' into develop