Merge "Fix crash from concurrent modification" into oc-dev