Issue #3548340: Use OOP hook implementations

Closes #3548340

Merge request reports

Loading