Update tasks.
Merge branch 'dev'