Issue #3608097 - Use oop hooks

Closes #3608097

Merge request reports

Loading