Merged a fix from ST4 to support Iterable.