Merge branch 'poll-multiplexer'