Merge pull request #1766 from tee8z/event-node-received