some rewrite in graph
Merge branch 'master' into comment_fix