am 0fc0cd0d: am 6f600e6c: am cd8a9f51: am edc43805: am b6d33df9: Fix concurrent modifcation exception (issue 11234805)

* commit '0fc0cd0d3773632f512069b703466308a2eb9977':