Issue #3554424: Convert hooks to class hooks

Closes #3554424

Merge request reports

Loading