Merge "Adding support to different ingress and egress ports (SFC)"