Resolve #3279660 "Entity context"

Andrew Berezovskyrequested to merge
3279660-entity_context into 8.x-1.x

Closes #3279660

Edited by Andrew Berezovsky

Merge request reports