fix: for iterating through list and modifying it in the same loop
Merge branch 'v2.26' into hotfixes-v2.26
Merge pull request #43 from 'hotfixes-v2.26'

fix: for iterating through list and modifying it in the same loop