Merge "ConcurrentModificationException in SyncManager"