Refactor.

Closes #3621529

Merge request reports

Loading