Resolve #3536388 "4 remove service from context"

Joachim Noreikorequested to merge
issue/entity_share-3536388:3536388-4-remove-service-from-context into 4.0.x

Closes #3536388

Merge request reports