Merge "Add critical sections to avoid ConcurrentModificationException" into main