Merge branch '294-events' into develop

3 jobs for v0.8.4 in 10 minutes and 22 seconds (queued for 2 seconds)
latest