Another attempt at setting native events
Merge remote-tracking branch 'origin/master'