Merge "Fix ConcurrentModificationException in OmniInvokerTest" into main