more event madness
Merge branch 'release/1.2.36'