Merge "Port-capability support in port-mapping 1.2.1"