Refactoring

Closes #3469611

Merge request reports

Loading