Merge "[Suggestion] Fix ConcurrentModificationException issue" into sc-dev