Resolve #2015121 "Inject various dependencies"

dimitriskrrequested to merge
issue/drupal-2015121:2015121-inject-various-dependencies into main

Closes #2015121

Merge request reports