Fix tasks runner
Merge branch 'tasks_runner'