Beginning the merge of the new multiplexer.

Signed-off-by: Ruda Moura <rmoura@redhat.com>