diff --git a/.commonfiles.sha b/.commonfiles.sha
index 2b1f5564..6d7f9cc4 100644
--- a/.commonfiles.sha
+++ b/.commonfiles.sha
@@ -1 +1 @@
-37d7abc98680f183c02efad281720d1db3072c64
+a9d5cc326ae26ee31b71daa518d9a71992f2c30b
diff --git a/.golangci.yml b/.golangci.yml
index 1cd3e071..80fcfd7e 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,7 +1,9 @@
+# WARNING: DO NOT EDIT, THIS FILE IS PROBABLY A COPY
+#
 # The original version of this file is located in the https://github.com/istio/common-files repo.
 # If you're looking at this file in a different repo and want to make a change, please go to the
-# common-files repo, make the change there and check it in. Then come back to this repo and run the
-# scripts/updatecommonfiles.sh script.
+# common-files repo, make the change there and check it in. Then come back to this repo and run
+# "make updatecommon".
 
 service:
   # When updating this, also update bin/linters.sh accordingly
diff --git a/BUGS-AND-FEATURE-REQUESTS.md b/BUGS-AND-FEATURE-REQUESTS.md
index a0366030..7b97d0e4 100644
--- a/BUGS-AND-FEATURE-REQUESTS.md
+++ b/BUGS-AND-FEATURE-REQUESTS.md
@@ -5,3 +5,6 @@ You can report bugs and feature requests to the Istio team in one of three place
 - [Product Bugs and Feature Requests](https://github.com/istio/istio/issues)
 - [Documentation Bugs and Feature Requests](https://github.com/istio/istio.io/issues)
 - [Community and Governance Issues](https://github.com/istio/community/issues)
+
+For security vulnerabilities, please don't report a bug (which is public) and instead follow
+[these procedures](https://istio.io/about/security-vulnerabilities/).
diff --git a/Makefile.common.mk b/Makefile.common.mk
index cc372956..ae4920c6 100644
--- a/Makefile.common.mk
+++ b/Makefile.common.mk
@@ -2,8 +2,8 @@
 #
 # The original version of this file is located in the https://github.com/istio/common-files repo.
 # If you're looking at this file in a different repo and want to make a change, please go to the
-# common-files repo, make the change there and check it in. Then come back to this repo and run the
-# scripts/updatecommonfiles.sh script.
+# common-files repo, make the change there and check it in. Then come back to this repo and run
+# "make updatecommon".
 
 # Copyright 2018 Istio Authors
 #
diff --git a/scripts/check_license.sh b/scripts/check_license.sh
index f003f4af..9a289877 100755
--- a/scripts/check_license.sh
+++ b/scripts/check_license.sh
@@ -4,8 +4,8 @@
 #
 # The original version of this file is located in the https://github.com/istio/common-files repo.
 # If you're looking at this file in a different repo and want to make a change, please go to the
-# common-files repo, make the change there and check it in. Then come back to this repo and run the
-# scripts/updatecommonfiles.sh script.
+# common-files repo, make the change there and check it in. Then come back to this repo and run
+# "make updatecommon".
 
 # Copyright 2018 Istio Authors
 #
diff --git a/scripts/run_gofmt.sh b/scripts/run_gofmt.sh
index 94fcaf32..30f6184b 100755
--- a/scripts/run_gofmt.sh
+++ b/scripts/run_gofmt.sh
@@ -4,8 +4,8 @@
 #
 # The original version of this file is located in the https://github.com/istio/common-files repo.
 # If you're looking at this file in a different repo and want to make a change, please go to the
-# common-files repo, make the change there and check it in. Then come back to this repo and run the
-# scripts/updatecommonfiles.sh script.
+# common-files repo, make the change there and check it in. Then come back to this repo and run
+# "make updatecommon".
 
 # Copyright 2018 Istio Authors
 #
diff --git a/scripts/run_golangci.sh b/scripts/run_golangci.sh
index e05f77ab..21d820f3 100755
--- a/scripts/run_golangci.sh
+++ b/scripts/run_golangci.sh
@@ -4,8 +4,8 @@
 #
 # The original version of this file is located in the https://github.com/istio/common-files repo.
 # If you're looking at this file in a different repo and want to make a change, please go to the
-# common-files repo, make the change there and check it in. Then come back to this repo and run the
-# scripts/updatecommonfiles.sh script.
+# common-files repo, make the change there and check it in. Then come back to this repo and run
+# "make updatecommon".
 
 # Copyright 2019 Istio Authors
 #
@@ -36,4 +36,5 @@ fi
 GOLANGCI_VERSION="v1.16.0"
 curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b "$GOPATH"/bin "$GOLANGCI_VERSION"
 golangci-lint --version
-env GOGC=25 golangci-lint run ${FIX} -j 1 -v ./...
+# For tuning and when switching versions PLEASE REFERENCE: https://github.com/istio/istio/issues/14888
+env GOGC=25 golangci-lint run ${FIX} -j 8 -v ./...