#8725-R: FeatureIterator and other minor changes