Performance improvements.

Closes #3570244

Merge request reports

Loading