am 4d709414: Merge "DataflowIterator normalization"

* commit '4d7094145fea6d4647400ab0d607b3bece0e1167':
  DataflowIterator normalization