Merge pull request #2236 from akoeplinger/add-dataflow