Remove eta based task timeout
Merge branch 'hotfix/0.2.4-2'

* hotfix/0.2.4-2:
  Remove eta based task timeout