partial commit
partial commit
Merge remote-tracking branch 'origin/dev' into erik
update cache to allow iterator to be aware in all cases
Improve tests about iterator and remove