Don't crash is cancel spot doesn't work
Merge branch 'vanilla_improvements' into datacratic_dev