Merge "[flexiglass] Addresses ConcurrentModificationException" into main