am cfb554d3: am 62318e1e: changed to use the new EntityIterator interface

Merge commit 'cfb554d3e3372581a9be80a3901d8bfa12433590'

* commit 'cfb554d3e3372581a9be80a3901d8bfa12433590':
  changed to use the new EntityIterator interface