Merge "Fix ConcurrentModificationException" into rvc-dev