Re #10031. Make sure iterators are valid.
Merge branch 'feature/10031_integrate_FABADA' into develop