Merge "Fix concurrent modification crash" into main