Resolve #3584995 "Switch to OOP Hooks"

Closes #3584995

Merge request reports

Loading