diff --git a/content/en/docs/reference/commands/istioctl/index.html b/content/en/docs/reference/commands/istioctl/index.html
index b17253e0f1..89de0edbc8 100644
--- a/content/en/docs/reference/commands/istioctl/index.html
+++ b/content/en/docs/reference/commands/istioctl/index.html
@@ -220,6 +220,11 @@ debug and diagnose their Istio mesh.
 <td>The severity level of analysis at which to set a non-zero exit code. Valid values: [Info Warning Error]  (default `Error`)</td>
 </tr>
 <tr>
+<td><code>--ignore-unknown</code></td>
+<td></td>
+<td>Don&#39;t complain about un-parseable input documents, for cases where analyze should run only on k8s compliant inputs. </td>
+</tr>
+<tr>
 <td><code>--istioNamespace &lt;string&gt;</code></td>
 <td><code>-i</code></td>
 <td>Istio system namespace  (default `istio-system`)</td>
diff --git a/content/en/docs/reference/config/istio.mesh.v1alpha1/index.html b/content/en/docs/reference/config/istio.mesh.v1alpha1/index.html
index 5b725e8c9c..12e0f3ed3d 100644
--- a/content/en/docs/reference/config/istio.mesh.v1alpha1/index.html
+++ b/content/en/docs/reference/config/istio.mesh.v1alpha1/index.html
@@ -7,7 +7,7 @@ location: https://istio.io/docs/reference/config/istio.mesh.v1alpha1.html
 layout: protoc-gen-docs
 generator: protoc-gen-docs
 weight: 20
-number_of_entries: 51
+number_of_entries: 52
 ---
 <p>Configuration affecting the service mesh as a whole.</p>
 
@@ -2486,9 +2486,9 @@ No
 No
 </td>
 </tr>
-<tr id="ProxyConfig-service_cluster">
+<tr id="ProxyConfig-service_cluster" class="oneof oneof-start">
 <td><code>serviceCluster</code></td>
-<td><code>string</code></td>
+<td><code>string (oneof)</code></td>
 <td>
 <p>Service cluster defines the name for the <code>service_cluster</code> that is
 shared by all Envoy instances. This setting corresponds to
@@ -2504,6 +2504,18 @@ receives API calls from Envoy, it uses the value of the <code>service-node</code
 flag to compute routes that are relative to the service instances
 located at that IP address.</p>
 
+</td>
+<td>
+No
+</td>
+</tr>
+<tr id="ProxyConfig-tracing_service_name" class="oneof">
+<td><code>tracingServiceName</code></td>
+<td><code><a href="#ProxyConfig-TracingServiceName">TracingServiceName (oneof)</a></code></td>
+<td>
+<p>Used by Envoy proxies to assign the values for the service names in trace
+spans.</p>
+
 </td>
 <td>
 No
@@ -3660,6 +3672,45 @@ See the
 <a href="https://github.com/openzipkin/b3-propagation">B3 header propagation README</a>
 for details.</p>
 
+</td>
+</tr>
+</tbody>
+</table>
+</section>
+<h2 id="ProxyConfig-TracingServiceName">ProxyConfig.TracingServiceName</h2>
+<section>
+<p>Allows specification of various Istio-supported naming schemes for the
+Envoy <code>service_cluster</code> value. The <code>servce_cluster</code> value is primarily used
+by Envoys to provide service names for tracing spans.</p>
+
+<table class="enum-values">
+<thead>
+<tr>
+<th>Name</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr id="ProxyConfig-TracingServiceName-APP_LABEL_AND_NAMESPACE">
+<td><code>APP_LABEL_AND_NAMESPACE</code></td>
+<td>
+<p>Default scheme. Uses the <code>app</code> label and workload namespace to construct
+a cluster name. If the <code>app</code> label does not exist <code>istio-proxy</code> is used.</p>
+
+</td>
+</tr>
+<tr id="ProxyConfig-TracingServiceName-CANONICAL_NAME_ONLY">
+<td><code>CANONICAL_NAME_ONLY</code></td>
+<td>
+<p>Uses the canonical name for a workload (<em>excluding namespace</em>).</p>
+
+</td>
+</tr>
+<tr id="ProxyConfig-TracingServiceName-CANONICAL_NAME_AND_NAMESPACE">
+<td><code>CANONICAL_NAME_AND_NAMESPACE</code></td>
+<td>
+<p>Uses the canonical name and namespace for a workload.</p>
+
 </td>
 </tr>
 </tbody>
diff --git a/content/en/docs/reference/config/networking/virtual-service/index.html b/content/en/docs/reference/config/networking/virtual-service/index.html
index 253b678e3e..c2bdcc566b 100644
--- a/content/en/docs/reference/config/networking/virtual-service/index.html
+++ b/content/en/docs/reference/config/networking/virtual-service/index.html
@@ -2324,9 +2324,9 @@ No
 <td>
 <p>Specifies the conditions under which retry takes place.
 One or more policies can be specified using a ‘,’ delimited list.
-If retry<em>on specifies a valid HTTP status, it will be added to retriable</em>status<em>codes retry policy.
-See the [retry policies](https://www.envoyproxy.io/docs/envoy/latest/configuration/http/http</em>filters/router<em>filter#x-envoy-retry-on)
-and [gRPC retry policies](https://www.envoyproxy.io/docs/envoy/latest/configuration/http/http</em>filters/router_filter#x-envoy-retry-grpc-on) for more details.</p>
+If <code>retry_on</code> specifies a valid HTTP status, it will be added to retriable<em>status</em>codes retry policy.
+See the <a href="https://www.envoyproxy.io/docs/envoy/latest/configuration/http/http_filters/router_filter#x-envoy-retry-on">retry policies</a>
+and <a href="https://www.envoyproxy.io/docs/envoy/latest/configuration/http/http_filters/router_filter#x-envoy-retry-grpc-on">gRPC retry policies</a> for more details.</p>
 
 </td>
 <td>