Fix for D2635 -  EntityManager only raises first EntityStateChange