Remaining fixes and refactor for DI Anti-pattern.
Related merge request !18 to merge 3491340-dependency-injection-anti-patterns
merge request
10 jobs
2 minutes 58 seconds, queued for 2 seconds