Merge "[COMMON] Update Ingress API"