Merge branch 'as/graph'