Merge "Add Multiplexer logic" into udc-dev