Iterable support
Merge branch '2.3'