Refactor code to manager class

Closes #3551864

Merge request reports

Loading