Hotfix for event updates
Merge branch 'hotfix/event-update'