feat: #3591033 Use OOP hook implementations

Closes #3591033

Merge request reports

Loading