Merge branch 'hotfix/fix-tas-resource'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Fix tasks page