Merge "Prevent ConcurrentModificationException" into main