Merge branch 'mh/ref-iterators'