Merge "Fixes in EntityEventPolicy"