Merge "Prevent ConcurrentModificationExceptions" into lmp-dev