am 7f2cbae2: am 8579e25f: changed to use the new EntityIterator interface

Merge commit '7f2cbae25f2d913ec047e0d614939e6d714ae9ce'

* commit '7f2cbae25f2d913ec047e0d614939e6d714ae9ce':
  changed to use the new EntityIterator interface