add cancel modiff
Merge branch 'zit3179' into dev