Merge branch 'close-event' into node-and-close