Merging newer event changes
Merge branch 'hotfix/e'