6247 Replace deprecated each function

Merged Elias Villiger requested to merge 6247-refactor-deprecated-each into master

Merge request reports