Resolve #3608097 "Use oop hook"

Closes #3608097

Merge request reports

Loading