Possible changes to local entity event handling
Modified to prevent local loopback of entity changes