Merge "Fixed a bug with auto cancelling" into nyc-dev