Update tasks
Merge branch 'hotfix/update-tasks'