[[ Bug 14044 ]] Refactor do ... in caller
Merge pull request #1492 from runrevali/bugfix-14044

[[ Bug 14044 ]] Refactor do ... in caller