Set up event data
Merge branch 'controls'