Merge branch 'rs/graph-simplify'