Merge "[SDNC] Fix Ingress Configuration"