Convert to OOP

Closes #3584553

Merge request reports

Loading