Resolve #3492284 "Add dependency injection"

nicxvanrequested to merge
issue/drupal-3492284:3492284-add-dependency-injection into main

Closes #3492284

Merge request reports