Issue #3588545: Replace legacy hooks with classes

Closes #3588545

Merge request reports

Loading