Merge "[COMMON] Fix Ingress templating"