fix cascading delete problem
Merge branch 'master' into staging