Merge pull request #2235 from CIB/feature

Event code fixes.