Remove circular reference between Graph and FilterContext
#1439
+16
−2
Graph and FilterContext
#1439