Dev/0.9.7/user cancel

Merge