[#1723] invoke close in eventloop
Merge remote-tracking branch: upstream/master