Merge "Fix coredns endpoint"