Update CoreEvents to master

Change-Id: I08f66861b7cba9786ce6f6275b6121a317e54ff5