Merge "Fixes collection modified while iterating by cloning the collection."