2024-July-29 - 2.7.14835

ConcurrentModification error: slightly hacky fix (#12791)

* ConcurrentModification error: slightly hacky fix

Should be a fix for #12789
This is not an ideal fix, and we likely have this problem in other areas.
It is possible this is a non-fix too, we should watch out for further error
reports to check carefully if this was a non-fix.

* Formatting