Fix issue with missing reinstate controller call
Change default cancellation to be EOT