Merge "Implement entry iterators"