Merge pull request #37 from hotfixes-v2.26

fix: for wrong elliptics config
Merge branch 'v2.26' into hotfixes-v2.26
fix: for iterating through list and modifying it in the same loop