diff --git a/content/en/docs/ops/diagnostic-tools/istioctl-analyze/index.md b/content/en/docs/ops/diagnostic-tools/istioctl-analyze/index.md
index ba4f912bd9..4ca6c7f77a 100644
--- a/content/en/docs/ops/diagnostic-tools/istioctl-analyze/index.md
+++ b/content/en/docs/ops/diagnostic-tools/istioctl-analyze/index.md
@@ -98,7 +98,7 @@ spec:
 status:
   validationMessages:
   - code: IST0101
-    documentation_url: https://istio.io/docs/reference/config/analysis/IST0101?ref=status-controller
+    documentation_url: https://istio.io/docs/reference/config/analysis/ist0101/?ref=status-controller
     level: Error
     message: 'Referenced gateway not found: "bogus-gateway"'
 {{< /text >}}
diff --git a/content/en/docs/ops/diagnostic-tools/istioctl-analyze/snips.sh b/content/en/docs/ops/diagnostic-tools/istioctl-analyze/snips.sh
index f45919f16a..6837064f3c 100644
--- a/content/en/docs/ops/diagnostic-tools/istioctl-analyze/snips.sh
+++ b/content/en/docs/ops/diagnostic-tools/istioctl-analyze/snips.sh
@@ -73,7 +73,7 @@ spec:
 status:
   validationMessages:
   - code: IST0101
-    documentation_url: https://istio.io/docs/reference/config/analysis/IST0101?ref=status-controller
+    documentation_url: https://istio.io/docs/reference/config/analysis/ist0101/?ref=status-controller
     level: Error
     message: 'Referenced gateway not found: "bogus-gateway"'
 ENDSNIP
diff --git a/content/en/docs/ops/diagnostic-tools/istioctl-analyze/test.sh b/content/en/docs/ops/diagnostic-tools/istioctl-analyze/test.sh
index 496a08c9d6..91c97e67ec 100755
--- a/content/en/docs/ops/diagnostic-tools/istioctl-analyze/test.sh
+++ b/content/en/docs/ops/diagnostic-tools/istioctl-analyze/test.sh
@@ -37,8 +37,8 @@ _verify_same snip_try_with_fixed_namespace "$snip_try_with_fixed_namespace_out"
 echo '*** istioctl-analyze step 3 ***'
 _verify_contains snip_analyze_sample_destrule "$snip_analyze_sample_destrule_out"
 
-# There are multiple DestinationRules, some are valid for the VirtualService, some lack subsets 
-echo '*** istioctl-analyze step ***'
+# There are multiple DestinationRules, some are valid for the VirtualService, some lack subsets
+echo '*** istioctl-analyze step 4 ***'
 snip_analyze_networking_directory || true
 
 echo '*** istioctl-analyze step 5 ***'
diff --git a/go.mod b/go.mod
index 2ef350e085..30dd2eeea3 100644
--- a/go.mod
+++ b/go.mod
@@ -12,8 +12,8 @@ replace github.com/docker/docker => github.com/docker/engine v1.4.2-0.2019101121
 
 require (
 	github.com/openshift/api v3.9.1-0.20191008181517-e4fd21196097+incompatible // indirect
-	istio.io/istio v0.0.0-20200729114235-7cb448bf1457
-	istio.io/pkg v0.0.0-20200728111233-bf9553504e38
+	istio.io/istio v0.0.0-20200804185308-92a32efe0684
+	istio.io/pkg v0.0.0-20200803132323-642e771c105a
 )
 
 replace github.com/Azure/go-autorest/autorest => github.com/Azure/go-autorest/autorest v0.9.0
diff --git a/go.sum b/go.sum
index 952f95a00b..26359903e5 100644
--- a/go.sum
+++ b/go.sum
@@ -1100,17 +1100,17 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 istio.io/api v0.0.0-20190515205759-982e5c3888c6/go.mod h1:hhLFQmpHia8zgaM37vb2ml9iS5NfNfqZGRt1pS9aVEo=
 istio.io/api v0.0.0-20200626203124-c07d1d63dab7/go.mod h1:88HN3o1fSD1jo+Z1WTLlJfMm9biopur6Ct9BFKjiB64=
-istio.io/api v0.0.0-20200724154317-1373a917b27e h1:UNxctQi6h3axA+3rBAlFZRpfSAPbPgSZJKoEPmb2dxs=
-istio.io/api v0.0.0-20200724154317-1373a917b27e/go.mod h1:88HN3o1fSD1jo+Z1WTLlJfMm9biopur6Ct9BFKjiB64=
+istio.io/api v0.0.0-20200803132616-f8b957462738 h1:T/5MGoEbqsDx3Z3cH17HsBzkTdq6860T2fnP18P7mcY=
+istio.io/api v0.0.0-20200803132616-f8b957462738/go.mod h1:88HN3o1fSD1jo+Z1WTLlJfMm9biopur6Ct9BFKjiB64=
 istio.io/client-go v0.0.0-20200626204548-8f69a2d0fe26 h1:XLTmjndquXukwZVU9G6c3d/2ew43te4SuMap8UTP1R4=
 istio.io/client-go v0.0.0-20200626204548-8f69a2d0fe26/go.mod h1:OQTGBgFbgNzUMafgS5LExTTMQAA+JeC6d0m1Tphi2dk=
 istio.io/gogo-genproto v0.0.0-20190930162913-45029607206a/go.mod h1:OzpAts7jljZceG4Vqi5/zXy/pOg1b209T3jb7Nv5wIs=
 istio.io/gogo-genproto v0.0.0-20200722223724-2684be210939 h1:uWWEPp0L4TlgkwprPcyWNALiMddZ9N05WrnULKB8Jbg=
 istio.io/gogo-genproto v0.0.0-20200722223724-2684be210939/go.mod h1:OzpAts7jljZceG4Vqi5/zXy/pOg1b209T3jb7Nv5wIs=
-istio.io/istio v0.0.0-20200729114235-7cb448bf1457 h1:4Ajp4bMT0WBAfG3Z4ZEyRrqP+MCkdsbR2MWvgm9/mZs=
-istio.io/istio v0.0.0-20200729114235-7cb448bf1457/go.mod h1:CzXvNoprbPWApmUjrj24OKAFpHDH1o2NDvse3I/sMAU=
-istio.io/pkg v0.0.0-20200728111233-bf9553504e38 h1:swwEZnkqBCJJ8sUxp00Kric61Td4Xlh0z3oN3ERwZ1U=
-istio.io/pkg v0.0.0-20200728111233-bf9553504e38/go.mod h1:EwvmercDF5DLCg5qUQlkM40xHwCxGoY1H/2LhI1p2YU=
+istio.io/istio v0.0.0-20200804185308-92a32efe0684 h1:oC+2Tom0c42R5G2r5Oq5MtAqBR6hVv2ZsWlB62HfXY8=
+istio.io/istio v0.0.0-20200804185308-92a32efe0684/go.mod h1:2DaqwtpKlG2Wq43ya5kprdmdWg1OZHjYNMfxpsrm+jg=
+istio.io/pkg v0.0.0-20200803132323-642e771c105a h1:/Vvvn6USFp2iHuq97fgC8I+BPVprgnczoCDz2BYbAW0=
+istio.io/pkg v0.0.0-20200803132323-642e771c105a/go.mod h1:EwvmercDF5DLCg5qUQlkM40xHwCxGoY1H/2LhI1p2YU=
 k8s.io/api v0.18.0/go.mod h1:q2HRQkfDzHMBZL9l/y9rH63PkQl4vae0xRT+8prbrK8=
 k8s.io/api v0.18.1/go.mod h1:3My4jorQWzSs5a+l7Ge6JBbIxChLnY8HnuT58ZWolss=
 k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78=