Merge pull request #2624 from abays/sysevent