Performance improvements

Closes #3581256

Merge request reports

Loading