Resolve #3426951 "Dependency injection"

Youri van Koppenrequested to merge
issue/feeds-3426951:3426951-dependency-injection into 8.x-3.x

Closes #3426951

Merge request reports