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

This reverts commit 8b5fdbdeaf27c6539281fdfb2c361ca255243332.