Add DataflowGraph and fix part of substitutions
#1449
Merged
DataflowGraph and fix part of substitutions
#1449