Merge branch 'ds/graph-assert-fix'