Issue #3557877: Use autowiring wherever possible

Closes #3557877

Merge request reports

Loading