Merge branch 'js/poll-emu'