Fix OOP hooks BC.

Closes #3565325

Merge request reports

Loading