diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index eaedca6510f..945a123f5b8 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -130,6 +130,12 @@ Upgrading from Solr 5.x
* SOLR-8736: The deprecated GET methods for schema are now accessible through the bulk API. The output
has less details and is not backward compatible.
+* In the past, Solr guaranteed that retrieval of multi-valued fields would preserve the order of values.
+ Because values may now be retrieved from column-stored fields (docValues="true"), in conjunction with the
+ fact that docValues do not currently preserve order, means that users should set useDocValuesAsStored="false"
+ to prevent future optizations from using the column-stored values over the row-stored values when
+ fields have both stored="true" and docValues="true".
+
Detailed Change List
----------------------
@@ -442,6 +448,9 @@ Other Changes
* SOLR-8836: Return 400, and a SolrException when an invalid json is provided to the update handler
instead of 500. (Jason Gerlowski via Anshum Gupta)
+* SOLR-8740: docValues are now enabled by default for most non-text (string, date, and numeric) fields
+ in the schema templates. (yonik)
+
================== 5.5.1 ==================
Bug Fixes
diff --git a/solr/server/solr/configsets/basic_configs/conf/managed-schema b/solr/server/solr/configsets/basic_configs/conf/managed-schema
index 2599a28dffd..3ce6b73e7ff 100644
--- a/solr/server/solr/configsets/basic_configs/conf/managed-schema
+++ b/solr/server/solr/configsets/basic_configs/conf/managed-schema
@@ -94,12 +94,12 @@
-
+
-
+
-
+
@@ -187,7 +187,7 @@
It supports doc values but in that case the field needs to be
single-valued and either required or have a default value.
-->
-
+
@@ -214,10 +214,10 @@
These fields support doc values, but they require the field to be
single-valued and either be required or have a default value.
-->
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
+
@@ -487,7 +487,7 @@
-
+
-
+
-
-
+
+
@@ -146,7 +146,7 @@
-
+
@@ -205,8 +205,8 @@
It supports doc values but in that case the field needs to be
single-valued and either required or have a default value.
-->
-
-
+
+
@@ -235,15 +235,15 @@
These fields support doc values, but they require the field to be
single-valued and either be required or have a default value.
-->
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
+
-
+
@@ -532,7 +532,7 @@
-
+
-false
diff --git a/solr/server/solr/configsets/sample_techproducts_configs/conf/managed-schema b/solr/server/solr/configsets/sample_techproducts_configs/conf/managed-schema
index ddba4835155..1000d9a3623 100644
--- a/solr/server/solr/configsets/sample_techproducts_configs/conf/managed-schema
+++ b/solr/server/solr/configsets/sample_techproducts_configs/conf/managed-schema
@@ -112,12 +112,12 @@
-
+
-
+
-
+
-
-
-
+
@@ -351,10 +338,10 @@
These fields support doc values, but they require the field to be
single-valued and either be required or have a default value.
-->
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
+
-
+
@@ -723,7 +710,7 @@
relevancy. -->
-
+