Merge "Change ingress base hostname"