Merge "Fixed a concurrent modification crash" into oc-dev