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