am b6d33df9: Fix concurrent modifcation exception (issue 11234805)

* commit 'b6d33df9092cacfda1768ffdb96a0770c861566d':
  Fix concurrent modifcation exception (issue 11234805)