Merge "ART: Fix iterator invalidation" into oc-dev