CA-130821 - better handling of Task.destroy API