Make less function calls

Closes #3560108

Merge request reports

Loading