Resolve #3553240 "Oop hooks"

Sascha Grossenbacherrequested to merge
issue/entity-3553240:3553240-oop-hooks into 8.x-1.x

Closes #3553240

Merge request reports