Merge branch 'fix_edit_graph2' into develop