Merge "Retry and ignore ConcurrentModificationException"