'Future' scope
Merge branch 'features/events-model'