Merge "Refactor ListenerMultiplexer with new capabilities"