Issue #3554784: Use OOP hook implementations

Closes #3554784

Merge request reports

Loading