Merge current master and reimplement Graph.mask using innerJoin