Revert "Revert "Merge branch '6.2.x' into 'BS-600_OrderTasksInCaseView'""

This reverts commit 3793b8bd7d0dd68980d871e9b266317cd48ed793.