Merge "Fix crash when deleting task" into oc-dev