cleanup, hooks, autowire

Closes #3572517

Merge request reports

Loading