Merge "Fixed a crash with the autocancelling" into nyc-dev