Integrate updated Graph code
Merge commits