Merge "Add port mapping for VF-C componnets"