Use new hook system

Closes #3588629

Merge request reports

Loading