fix: #3586965 Dependency injection anti-patterns

Closes #3586965

Merge request reports

Loading