Resolve #3586857 "Oop hooks"

Closes #3586857

Merge request reports

Loading