Add core events
Merge origin/master
Add core events