Merge "PortMapping Refactoring step 3"