More performant code

Closes #3559900

Merge request reports

Loading