Merge "Moved MappedIterator to /libs and changed exception type"