feat: #3616715 Use OOP hook implementations

igor mashevskyirequested to merge
issue/comment_notify-3616715:3616715-use-oop-hook into 8.x-1.x

Closes #3616715

Merge request reports