feat: #3616715 Use OOP hook implementations

Closes #3616715

Merge request reports

Loading