Avoid function usage in loops
Merge pull request #5833
Merge pull request #5833 in master