Update CoreEvents to master

Change-Id: I0efad1e4787a20940b84720c21bf98a55ea42a2e