fix clear graph
Merge branch 'master' into soft-delete