Issue #3547855: Use OOP hook implementations

Closes #3547855

Merge request reports

Loading