Merge pull request #3277 from abays/sysevent