Merge "PortMapping for device 1.2.1 and 2.2"