diff --git a/website/source/docs/agent/options.html.md b/website/source/docs/agent/options.html.md
index 63310813dd..c06c9bfb7a 100644
--- a/website/source/docs/agent/options.html.md
+++ b/website/source/docs/agent/options.html.md
@@ -760,6 +760,9 @@ default will automatically work with some tooling.
 
 *   <a name="autopilot"></a><a href="#autopilot">`autopilot`</a> Added in Consul 0.8, this object
     allows a number of sub-keys to be set which can configure operator-friendly settings for Consul servers.
+    When these keys are provided as configuration, they will only be respected on bootstrapping. If they are not
+    provided, the defaults will be used. In order to change the value of these options after bootstrapping, you will
+    need to use the [Consul Operator Autopilot](https://www.consul.io/docs/commands/operator/autopilot.html) command.
     For more information about Autopilot, see the [Autopilot Guide](https://learn.hashicorp.com/consul/day-2-operations/autopilot).
 
     The following sub-keys are available:
@@ -791,6 +794,10 @@ default will automatically work with some tooling.
       until enough newer-versioned servers have been added to the cluster before promoting any of them to voters. Defaults
       to `false`.
 
+    * <a name="upgrade_version_tag"></a><a href="#upgrade_version_tag">`upgrade_version_tag`</a> - (Enterprise-only)
+      The node_meta tag to use for version info when performing upgrade migrations. If this is not set, the Consul
+      version will be used.
+
 * <a name="auto_encrypt"></a><a href="#auto_encrypt">`auto_encrypt`</a>
     This object allows setting options for the `auto_encrypt` feature.
 
diff --git a/website/source/intro/vs/proxies.html.md b/website/source/intro/vs/proxies.html.md
index 9b99717109..a4fba6d75f 100644
--- a/website/source/intro/vs/proxies.html.md
+++ b/website/source/intro/vs/proxies.html.md
@@ -10,7 +10,8 @@ description: |-
 
 Modern service proxies provide high-level service routing, authentication,
 telemetry, and more for microservice and cloud environments. Envoy is
-a popular and feature rich proxy.
+a popular and feature-rich proxy that is often
+used on its own. Consul [integrates with Envoy](https://www.consul.io/docs/connect/proxies/envoy.html) to simplify its configuration. 
 
 Proxies require a rich set of configuration to operate since backend
 addresses, frontend listeners, routes, filters, telemetry shipping, and
@@ -33,23 +34,20 @@ access graph, but still requires a proxy to exist in the data path. As a
 control plane, Consul integrates with many data plane solutions including
 Envoy, HAProxy, Nginx, and more.
 
-Consul provides a built-in proxy written in Go. This trades performance
-for ease of use: by being built-in to Consul, users of Consul can get
-started with solutions such as Connect without needing to install other
-software. But the built-in proxy isn't meant to compete on features or
-performance with dedicated proxy solutions such as Envoy. Consul enables
+The [Consul Envoy integration](https://www.consul.io/docs/connect/proxies/envoy.html)
+is currently the primary way to utilize advanced layer 7 features provided
+by Consul. In addition to Envoy, Consul enables
 third party proxies to integrate with Connect and provide the data
 plane with Consul operating as the control plane.
 
-The Connect feature of Consul operates at layer 4 by authorizing a TLS
-connection to succeed or fail. Proxies provide excellent solutions to
-layer 7 concerns such as path-based routing, tracing and telemetry, and
-more. Consul encourages using any proxy that provides the featureset required
-by the user.
+Proxies provide excellent solutions to layer 7 concerns such as path-based
+routing, tracing and telemetry, and more. By supporting a pluggable data plane model, the right proxy can be
+deployed as needed.
+For performance-critical applications or those
+that utilize layer 7 functionality, Envoy can be used. For non-performance critical layer 4 applications, you can use Consul's [built-in proxy](https://www.consul.io/docs/connect/proxies/built-in.html) for convenience.
 
-Further, by supporting a pluggable data plane model, the right proxy can be
-deployed as needed. For non-performance critical applications, the built-in
-proxy can be used. For performance critical applications, Envoy can be used.
 For some applications that may require hardware, a hardware load balancer
-such an F5 appliance may be deployed. Consul provides an API for all of these
-solutions to be integrated.
+such an F5 appliance may be deployed. Consul encourages this use of the right
+proxy for the scenario and treats hardware load balancers as swappable components that can be run
+alongside other proxies, assuming they integrate with the [necessary APIs](https://www.consul.io/docs/connect/proxies/integrate.html)
+for Connect.