Use dependency injection

Closes #3408946

Merge request reports

Loading