diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ebccd4849220..7360ff5a687d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,28 @@
+## v1.20.1 [2021-10-06]
+
+#### Bugfixes
+
+  - [#9776](https://github.com/influxdata/telegraf/pull/9776) Update k8s.io/apimachinery module from 0.21.1 to 0.22.2
+  - [#9864](https://github.com/influxdata/telegraf/pull/9864) Update containerd module to v1.5.7
+  - [#9863](https://github.com/influxdata/telegraf/pull/9863) Update consul module to v1.11.0
+  - [#9846](https://github.com/influxdata/telegraf/pull/9846) `inputs.mongodb` Fix panic due to nil dereference
+  - [#9850](https://github.com/influxdata/telegraf/pull/9850) `inputs.intel_rdt` Prevent timeout when logging
+  - [#9848](https://github.com/influxdata/telegraf/pull/9848) `outputs.loki` Update http_headers setting to match sample config
+  - [#9808](https://github.com/influxdata/telegraf/pull/9808) `inputs.procstat` Add missing tags
+  - [#9803](https://github.com/influxdata/telegraf/pull/9803) `outputs.mqtt` Add keep alive config option and documentation around issue with eclipse/mosquitto version
+  - [#9800](https://github.com/influxdata/telegraf/pull/9800) Fix output buffer never completely flushing
+  - [#9458](https://github.com/influxdata/telegraf/pull/9458) `inputs.couchbase` Fix insecure certificate validation
+  - [#9797](https://github.com/influxdata/telegraf/pull/9797) `inputs.opentelemetry` Fix error returned to OpenTelemetry client
+  - [#9789](https://github.com/influxdata/telegraf/pull/9789) Update github.com/testcontainers/testcontainers-go module from 0.11.0 to 0.11.1
+  - [#9791](https://github.com/influxdata/telegraf/pull/9791) Update github.com/Azure/go-autorest/autorest/adal module
+  - [#9678](https://github.com/influxdata/telegraf/pull/9678) Update github.com/Azure/go-autorest/autorest/azure/auth module from 0.5.6 to 0.5.8
+  - [#9769](https://github.com/influxdata/telegraf/pull/9769) Update cloud.google.com/go/pubsub module from 1.15.0 to 1.17.0
+  - [#9770](https://github.com/influxdata/telegraf/pull/9770) Update github.com/aws/smithy-go module from 1.3.1 to 1.8.0
+
+#### Features
+
+  - [#9838](https://github.com/influxdata/telegraf/pull/9838) `inputs.elasticsearch_query` Add custom time/date format field
+
 ## v1.20.0 [2021-09-17]
 
 #### Release Notes
diff --git a/etc/telegraf.conf b/etc/telegraf.conf
index 5564bc23ac8aa..2f2dce2f61df6 100644
--- a/etc/telegraf.conf
+++ b/etc/telegraf.conf
@@ -765,9 +765,6 @@
 #   ## Endpoints for your graylog instances.
 #   servers = ["udp://127.0.0.1:12201"]
 #
-#   ## Connection timeout.
-#   # timeout = "5s"
-#
 #   ## The field to use as the GELF short_message, if unset the static string
 #   ## "telegraf" will be used.
 #   ##   example: short_message_field = "message"
@@ -4801,12 +4798,6 @@
 #   # ]
 
 
-# # Read metrics about LVM physical volumes, volume groups, logical volumes.
-# [[inputs.lvm]]
-# ## Use sudo to run LVM commands
-# use_sudo = false
-
-
 # # Gathers metrics from the /3.0/reports MailChimp API
 # [[inputs.mailchimp]]
 #   ## MailChimp API key
@@ -5501,12 +5492,6 @@
 #   ## Password. Required for auth_method = "UserName"
 #   # password = ""
 #   #
-#   ## Option to select the metric timestamp to use. Valid options are:
-#   ##     "gather" -- uses the time of receiving the data in telegraf
-#   ##     "server" -- uses the timestamp provided by the server
-#   ##     "source" -- uses the timestamp provided by the source
-#   # timestamp = "gather"
-#   #
 #   ## Node ID configuration
 #   ## name              - field name to use in the output
 #   ## namespace         - OPC UA namespace of the node (integer value 0 thru 3)