Issue #3584431: Refactor code with DI

Closes #3584431

Merge request reports

Loading