Merge "Fix ConcurrentModificationException"