Merge pull request #1252 from auouymous/fix-1248-cancel-failed-tasks