Merge branch 'feature/add-event-support' into 'develop'