Merge "Fix ExtendedProperties EntityIterator."