Merge "Do not try to restore a task id if it does not exist." into oc-dev