Major refactor

Closes #3562548

Merge request reports

Loading