diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac85f7b9c14..3425e2fe6d3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,9 @@ IMPROVEMENTS:
 * build: Updated to Go 1.12.16 [[GH-7009](https://github.com/hashicorp/nomad/issues/7009)]
 * cli: Added option to change the name of the file created by the `nomad init` command [[GH-6520]](https://github.com/hashicorp/nomad/pull/6520)
 * cli: Included namespace in output when querying job stauts. [[GH-6912](https://github.com/hashicorp/nomad/issues/6912)]
+* client: Supported AWS EC2 Instance Metadata Service Version 2 (IMDSv2) [[GH-6779](https://github.com/hashicorp/nomad/issues/6779)]
+* driver/docker: Added a `disable_log_collection` parameter to disable nomad log collection [[GH-6820](https://github.com/hashicorp/nomad/issues/6820)]
+* server: Introduced a `default_scheduler_config` config parameter to seed initial preemption configuration. [[GH-6935](https://github.com/hashicorp/nomad/issues/6935)]
 * scheduler: Removed penalty for allocation's previous node if the allocation did not fail. [[GH-6781](https://github.com/hashicorp/nomad/issues/6781)]
 * scheduler: Reduced logging verbosity during preemption [[GH-6849](https://github.com/hashicorp/nomad/issues/6849)]
 * ui: Updated Run Job button to be conditionally enabled according to ACLs [[GH-5944](https://github.com/hashicorp/nomad/pull/5944)]
@@ -17,12 +20,16 @@ IMPROVEMENTS:
 
 BUG FIXES:
 
+ * core: Addressed an inconsistency where allocations created prior to 0.9 had missing fields [[GH-6922](https://github.com/hashicorp/nomad/issues/6922)]
  * agent: Fixed race condition in logging when using `nomad monitor` command [[GH-6872](https://github.com/hashicorp/nomad/issues/6872)]
  * agent: Fixed a bug where `nomad monitor -server-id` only work for a server's name instead of uuid or name. [[GH-7015](https://github.com/hashicorp/nomad/issues/7015)]
  * cli: Fixed a bug where `nomad monitor -node-id` would cause a cli panic when no nodes where found. [[GH-6828](https://github.com/hashicorp/nomad/issues/6828)]
+ * cli: Fixed a bug where error messages appeared interweived with help text inconsistently [[GH-6865](https://github.com/hashicorp/nomad/issues/6865)]
  * config: Fixed a bug where agent startup would fail if the `consul.timeout` configuration was set. [[GH-6907](https://github.com/hashicorp/nomad/issues/6907)]
  * consul: Fixed a bug where script-based health checks would fail if the service configuration included interpolation. [[GH-6916](https://github.com/hashicorp/nomad/issues/6916)]
  * consul/connect: Fixed a bug where Connect-enabled jobs failed to validate when service names used interpolation. [[GH-6855](https://github.com/hashicorp/nomad/issues/6855)]
+ * driver/exec: Fixed a bug where systemd cgroup wasn't removed upon a task completion [[GH-6839](https://github.com/hashicorp/nomad/issues/6839)]
+ * server: Fixed a deadlock that may occur when server leadership flaps very quickly [[GH-6977](https://github.com/hashicorp/nomad/issues/6977)]
  * scheduler: Fixed a bug that caused evicted allocs on a lost node to be stuck in running. [[GH-6902](https://github.com/hashicorp/nomad/issues/6902)]
  * scheduler: Fixed a bug where `nomad job plan/apply` returned errors instead of a partial placement warning for ineligible nodes. [[GH-6968](https://github.com/hashicorp/nomad/issues/6968)]
 
diff --git a/website/source/docs/configuration/server.html.md b/website/source/docs/configuration/server.html.md
index 2c153c9b110..00a478f6ffe 100644
--- a/website/source/docs/configuration/server.html.md
+++ b/website/source/docs/configuration/server.html.md
@@ -98,6 +98,13 @@ server {
   deployment must be in the terminal state before it is eligible for garbage
   collection. This is specified using a label suffix like "30s" or "1h".
 
+- `default_scheduler_config` <code>([scheduler_configuration][update-scheduler-config]:
+  nil)</code> - Specifies the initial default scheduler config when
+  bootstrapping cluster. The parameter is ignored once the cluster is bootstrapped or
+  value is updated through the [API endpoint][update-scheduler-config]. See [the
+  example section](#configuring-scheduler-config) for more details
+  `default_scheduler_config` was introduced in Nomad 0.11.4.
+
 - `heartbeat_grace` `(string: "10s")` - Specifies the additional time given as a
   grace period beyond the heartbeat TTL of nodes to account for network and
   processing delays as well as clock skew. This is specified using a label
@@ -232,5 +239,31 @@ server {
 }
 ```
 
+### Configuring Scheduler Config
+
+This example shows enabling preemption for all schedulers.
+
+```hcl
+server {
+  default_scheduler_config {
+    preemption_config {
+      batch_scheduler_enabled   = true
+      system_scheduler_enabled  = true
+      service_scheduler_enabled = true
+    }
+  }
+}
+```
+
+The structure matches the [Update Scheduler Config][update-scheduler-config] endpoint,
+but adopted to hcl syntax (namely using snake case rather than camel case).
+
+Nomad servers check their `default_scheduler_config` only during cluster
+bootstrap. During upgrades, if a previously bootstrapped cluster already set
+scheduler configuration via the [Update Scheduler Config][update-scheduler-config]
+endpoint, that is always preferred.
+
+
 [encryption]: /guides/security/encryption.html "Nomad Encryption Overview"
 [server-join]: /docs/configuration/server_join.html "Server Join"
+[update-scheduler-config]: /api/operator.html#update-scheduler-configuration "Scheduler Config"
diff --git a/website/source/docs/drivers/docker.html.md b/website/source/docs/drivers/docker.html.md
index 970158fa803..eb16127bcdc 100644
--- a/website/source/docs/drivers/docker.html.md
+++ b/website/source/docs/drivers/docker.html.md
@@ -719,6 +719,11 @@ plugin "docker" {
       `cert` and `key` to use a TLS client to connect to the docker daemon.
       `endpoint` must also be specified or this setting will be ignored.
 
+* `disable_log_collection` - Defaults to `false`. Setting this to true will
+   disable Nomad logs collection of Docker tasks. If you don't rely on nomad log
+   capabilities and exclusively use host based log aggregation, you may consider
+   this option to disable nomad log collection overhead.
+
 * `gc` stanza:
     * `image` - Defaults to `true`. Changing this to `false` will prevent Nomad
       from removing images from stopped tasks.