[TIMOB-13370] Ensure no concurrentModification Exception
Merge pull request #4122 from vishalduggal/timob-13370

[TIMOB-13370] Ensure no concurrentModification Exception