Merge branch 'IOMultiplexer'