changes similar to LInux version
Merge remote-tracking branch 'upstream/master'
The event members should be initialized