Issue #3584468: Convert the existing hooks into OOP hooks

Closes #3584468

Merge request reports

Loading