#951048 by EclipseGc: Tighter entity integration so that new entities are automatic contexts and relationships.