Merge branch 'bug_747_cancel_waiting_tasks' into experimental