Merge branch 'cobrien7-event-callbacks'