Merge "Fix bug with removing a failed job"