Issue #3583335: Use autowired services

Closes #3583335

Merge request reports

Loading