Convert procedural hooks to OOP hooks

Closes #3611323

Merge request reports

Loading