Merge "Prevent ConcurrentModificationExceptions in log"