Refactor.

Closes #3581403

Merge request reports

Loading