fix edit graph
Merge branch 'fix_edit_graph' into develop