feat: #3606535 Use OOP hook implementations

Closes #3606535

Merge request reports

Loading