use autowiring where possible

Closes #3591423

Merge request reports

Loading