Refactor module

Closes #3565648

Merge request reports

Loading