Merge from private branch with the XDI Graph Editor v2