Merge "DataflowIterator normalization"