Merge branch 'release/1.2.4' into dev
safer config elements loop
bump version
Merge branch 'release/1.2.5'