Merge "Update PortMapping & imports to v1.2.1"