Issue #2932462 by phenaproxima, japerry, tim.plunkett: Add EntityContextDefinition for the 80% use case