Update CoreEvents to master

Change-Id: I0adf9c322445046cfc211cd5bcceaf815b5381ee