Merge "[SDC] Fix Ingress configuration"