diff --git a/cts/schemas/test-3/ref.err/id-ref.ref.err-2 b/cts/schemas/test-3/ref.err/id-ref.ref.err-2
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref.err/no-validate-with.ref.err-2 b/cts/schemas/test-3/ref.err/no-validate-with.ref.err-2
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref.err/nvpair-no-value.ref.err-2 b/cts/schemas/test-3/ref.err/nvpair-no-value.ref.err-2
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref.err/sort-nvsets.ref.err-2 b/cts/schemas/test-3/ref.err/sort-nvsets.ref.err-2
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref/id-ref.ref-2 b/cts/schemas/test-3/ref/id-ref.ref-2
new file mode 100644
index 0000000000..6a43d728dd
--- /dev/null
+++ b/cts/schemas/test-3/ref/id-ref.ref-2
@@ -0,0 +1,72 @@
+<cib crm_feature_set="3.19.7" validate-with="pacemaker-4.0" epoch="16" num_updates="0" admin_epoch="0" original="1">
+  <configuration original="1">
+    <!-- The essential elements of this test are:
+         * There is a cluster_properties_set element with an id attribute (set
+           to cluster-properties1) and a set of nvpair children.
+         * There are two cluster_properties_set elements with an id-ref
+           attribute (set to cluster-properties1): one before and one after the
+           original.
+         * There is a primitive resource (rsc1) with a meta_attributes element
+           containing nvpair children.
+           * The first nvpair is a definition (has an id attribute).
+           * The second has an id-ref attribute with no name attribute.
+           * The third has id-ref="cluster-properties1-option1" and
+             name="option3". Setting both id-ref and name is an undocumented
+             feature that allows the same nvpair value to be used with multiple
+             names (see commit 3912538 and associated pull request).
+
+         In this situation:
+         * In the first step of the upgrade transformation pipeline:
+           * Each element with an id-ref attribute without a name attribute
+             should be replaced by a copy of the element whose id attribute is
+             set to the same value, but with the "original" attribute set to 1.
+           * Each element with an id-ref attribute and a name attribute should
+             be replaced by a copy of the element whose id attribute is set to
+             the original id-ref value, except that in the copy:
+             * The id attribute begins with $upgrade_prefix and ends with the
+               value of @name.
+             * The name attribute is overridden by the reference's @name value.
+         * In the final step:
+           * Resolved references that did not have name attributes should be
+             converted back to references.
+           * For resolved references that did have name attributes, such that
+             the id of the resolved element differs from the original id-ref
+             value:
+             * The first element with the new id value remains expanded as a
+               definition.
+             * Any subsequent elements with the new id value are converted to
+               references to the first one.
+      -->
+    <crm_config original="1">
+      <cluster_property_set id="cluster-properties1" original="0">
+        <nvpair id="cluster-properties1-option1" name="option1" value="value1" original="0"/>
+        <nvpair id="cluster-properties1-option2" name="option2" value="value2" original="0"/>
+      </cluster_property_set>
+      <cluster_property_set id="cluster-properties1" original="1">
+        <nvpair id="cluster-properties1-option1" name="option1" value="value1" original="1"/>
+        <nvpair id="cluster-properties1-option2" name="option2" value="value2" original="1"/>
+      </cluster_property_set>
+      <cluster_property_set id="cluster-properties1" original="0">
+        <nvpair id="cluster-properties1-option1" name="option1" value="value1" original="0"/>
+        <nvpair id="cluster-properties1-option2" name="option2" value="value2" original="0"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes original="1"/>
+    <resources original="1">
+      <primitive id="rsc1" class="ocf" provider="pacemaker" type="Dummy" original="1">
+        <meta_attributes id="rsc1-meta_attributes" original="1">
+          <nvpair id="rsc1-meta_attributes-option1" name="option1" value="valueX" original="1"/>
+          <nvpair id="cluster-properties1-option1" name="option1" value="value1" original="0"/>
+          <nvpair id="pcmk__3_10_upgrade-cluster-properties1-option1-option3" name="option3" value="value1" original="0"/>
+        </meta_attributes>
+      </primitive>
+      <primitive id="rsc2" class="ocf" provider="pacemaker" type="Dummy" original="1">
+        <meta_attributes id="rsc2-meta_attributes" original="1">
+          <nvpair id="pcmk__3_10_upgrade-cluster-properties1-option1-option3" name="option3" value="value1" original="0"/>
+        </meta_attributes>
+      </primitive>
+    </resources>
+    <constraints original="1"/>
+  </configuration>
+  <status original="1"/>
+</cib>
diff --git a/cts/schemas/test-3/ref/no-validate-with.ref-2 b/cts/schemas/test-3/ref/no-validate-with.ref-2
new file mode 100644
index 0000000000..392eb408f3
--- /dev/null
+++ b/cts/schemas/test-3/ref/no-validate-with.ref-2
@@ -0,0 +1,15 @@
+<cib crm_feature_set="3.19.7" epoch="16" num_updates="0" admin_epoch="0" original="1" validate-with="pacemaker-4.0">
+  <configuration original="1">
+    <!-- The essential elements of this test are:
+         * The cib element does not contain a validate-with attribute.
+
+         In this situation, the validate-with attribute should be set to
+         "pacemaker-4.0".
+      -->
+    <crm_config original="1"/>
+    <nodes original="1"/>
+    <resources original="1"/>
+    <constraints original="1"/>
+  </configuration>
+  <status original="1"/>
+</cib>
diff --git a/cts/schemas/test-3/ref/nvpair-no-value.ref-2 b/cts/schemas/test-3/ref/nvpair-no-value.ref-2
new file mode 100644
index 0000000000..5820a8429d
--- /dev/null
+++ b/cts/schemas/test-3/ref/nvpair-no-value.ref-2
@@ -0,0 +1,33 @@
+<cib crm_feature_set="3.19.7" validate-with="pacemaker-4.0" epoch="8" num_updates="0" admin_epoch="0" original="1">
+  <configuration original="1">
+    <!-- The essential elements of this test are:
+         * There is one nvset element of each type: cluster_property_set,
+           instance_attributes, meta_attributes, utilization.
+         * Each nvset contains one nvpair with a value and one nvpair with no
+           value.
+
+         In this situation, all nvpair elements with no value should be dropped.
+      -->
+    <crm_config original="1">
+      <cluster_property_set id="cib-bootstrap-options" original="1">
+        <nvpair id="cib-bootstrap-options-option2" name="option2" value="value2" original="1"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes original="1"/>
+    <resources original="1">
+      <primitive class="ocf" id="rsc1" provider="pacemaker" type="Dummy" original="1">
+        <instance_attributes id="rsc1-instance_attributes" original="1">
+          <nvpair id="rsc1-instance_attributes-option2" name="option2" value="value2" original="1"/>
+        </instance_attributes>
+        <meta_attributes id="rsc1-meta_attributes" original="1">
+          <nvpair id="rsc1-meta_attributes-option2" name="option2" value="value2" original="1"/>
+        </meta_attributes>
+        <utilization id="rsc1-utilization" original="1">
+          <nvpair id="rsc1-utilization-option2" name="option2" value="value2" original="1"/>
+        </utilization>
+      </primitive>
+    </resources>
+    <constraints original="1"/>
+  </configuration>
+  <status original="1"/>
+</cib>
diff --git a/cts/schemas/test-3/ref/sort-nvsets.ref-2 b/cts/schemas/test-3/ref/sort-nvsets.ref-2
new file mode 100644
index 0000000000..38cfc6e4cc
--- /dev/null
+++ b/cts/schemas/test-3/ref/sort-nvsets.ref-2
@@ -0,0 +1,115 @@
+<cib crm_feature_set="3.19.7" validate-with="pacemaker-4.0" epoch="8" num_updates="0" admin_epoch="0" original="1">
+  <configuration original="1">
+    <!-- The essential elements of this test are:
+         * There are several nvset elements (cluster_property_set,
+           instance_attributes, meta_attributes, utilization) distributed among
+           various parent element types.
+         * Many of the nvsets have score attributes.
+         * Each of the nvsets has an id attribute with a number that indicates
+           its sort order relative to its siblings of the same element type, or
+           an id-ref to the same.
+         * One cluster_property_set has id "cib-bootstrap-options" and score
+           "-INFINITY".
+         * One meta_attributes set has an nvpair child, to verify that children
+           are preserved. Otherwise, children are omitted, for readability.
+         * The document orders of 0 vs. empty score and of "INFINITY" vs.
+           "+INFINITY" are reversed in rsc_defaults and op_defaults compared to
+           the other elements.
+
+         In this situation:
+         * All nvset elements should be moved below their non-nvset siblings.
+         * The cluster_property_set with id "cib-bootstrap-options" should be
+           ordered before all its siblings. "cib-bootstrap-options" always sorts
+           first regardless of score.
+         * Otherwise, nvset elements of a given type under a given parent should
+           be ordered according to their score attribute (using document order
+           in case of a tie), which corresponds to the numbers in their IDs.
+
+         This doesn't test every possible location where a nvset elements may
+         occur, but it should be exhaustive enough to be satisfactory.
+      -->
+    <crm_config original="1">
+      <cluster_property_set id="cib-bootstrap-options" score="-INFINITY" original="1"/>
+      <cluster_property_set id="cps1" score="+INFINITY" original="1"/>
+      <cluster_property_set id="cps2" score="INFINITY" original="1"/>
+      <cluster_property_set id="cps3" score="120" original="1"/>
+      <cluster_property_set id="cps4" score="70" original="1"/>
+      <cluster_property_set id="cps5" original="1"/>
+      <cluster_property_set id="cps6" score="0" original="1"/>
+      <cluster_property_set id="cps7" score="-30" original="1"/>
+      <cluster_property_set id="cps8" score="-INFINITY" original="1"/>
+    </crm_config>
+    <nodes original="1"/>
+    <resources original="1">
+      <clone id="clone1" original="1">
+        <primitive class="ocf" id="rsc1" provider="heartbeat" type="apache" original="1">
+          <operations original="1">
+            <op id="rsc1_monitor_20000" interval="20s" name="monitor" original="1">
+              <meta_attributes id="oma1" score="120" original="1"/>
+              <meta_attributes id="oma2" original="1"/>
+              <meta_attributes id="oma3" score="-30" original="1"/>
+            </op>
+          </operations>
+          <instance_attributes id="pia1" score="+INFINITY" original="1"/>
+          <instance_attributes id="pia2" score="INFINITY" original="1"/>
+          <utilization id="pu1" score="+INFINITY" original="1"/>
+          <meta_attributes id="pma1" score="+INFINITY" original="1"/>
+          <meta_attributes id="pma2" score="INFINITY" original="1"/>
+          <utilization id="pu2" score="INFINITY" original="1"/>
+          <utilization id="pu3" score="120" original="1"/>
+          <meta_attributes id="pma3" score="120" original="1"/>
+          <instance_attributes id="pia3" score="120" original="1"/>
+          <meta_attributes id="pma4" score="70" original="1"/>
+          <utilization id="pu4" score="70" original="1"/>
+          <instance_attributes id="pia4" score="70" original="1"/>
+          <instance_attributes id="pia5" original="1"/>
+          <utilization id="pu5" original="1"/>
+          <meta_attributes id="pma5" original="1"/>
+          <meta_attributes id="pma6" score="0" original="1"/>
+          <utilization id="pu6" score="0" original="1"/>
+          <instance_attributes id="pia6" score="0" original="1"/>
+          <meta_attributes id="pma7" score="-30" original="1"/>
+          <utilization id="pu7" score="-30" original="1"/>
+          <instance_attributes id="pia7" score="-30" original="1"/>
+          <meta_attributes id="pma8" score="-INFINITY" original="1"/>
+          <utilization id="pu8" score="-INFINITY" original="1"/>
+          <instance_attributes id="pia8" score="-INFINITY" original="1"/>
+        </primitive>
+        <meta_attributes id="cma1" score="+INFINITY" original="1"/>
+        <meta_attributes id="cma2" score="INFINITY" original="1"/>
+        <meta_attributes id="cma3" score="120" original="1"/>
+        <meta_attributes id="cma4" score="70" original="1"/>
+        <meta_attributes id="cma5" original="1"/>
+        <meta_attributes id="cma6" score="0" original="1"/>
+        <meta_attributes id="cma7" score="-30" original="1"/>
+        <meta_attributes id="cma8" score="-INFINITY" original="1"/>
+      </clone>
+    </resources>
+    <constraints original="1"/>
+    <rsc_defaults original="1">
+      <meta_attributes id="rdma1" score="INFINITY" original="1"/>
+      <meta_attributes id="rdma2" score="+INFINITY" original="1"/>
+      <meta_attributes id="rdma3" score="120" original="1">
+        <nvpair id="rdma3-option1" name="option1" value="value1" original="1"/>
+      </meta_attributes>
+      <meta_attributes id="rdma4" score="70" original="1"/>
+      <meta_attributes id="rdma5" score="0" original="1"/>
+      <meta_attributes id="rdma6" original="1"/>
+      <meta_attributes id="rdma7" score="-30" original="1"/>
+      <meta_attributes id="rdma8" score="-INFINITY" original="1"/>
+    </rsc_defaults>
+    <op_defaults original="1">
+      <meta_attributes id="rdma1" score="INFINITY" original="0"/>
+      <meta_attributes id="rdma2" score="+INFINITY" original="0"/>
+      <meta_attributes id="rdma3" score="120" original="0">
+        <nvpair id="rdma3-option1" name="option1" value="value1" original="0"/>
+      </meta_attributes>
+      <meta_attributes id="rdma4" score="70" original="0"/>
+      <meta_attributes id="rdma5" score="0" original="0"/>
+      <meta_attributes id="rdma6" original="0"/>
+      <meta_attributes id="rdma7" score="-30" original="0"/>
+      <meta_attributes id="rdma8" score="-INFINITY" original="0"/>
+    </op_defaults>
+  </configuration>
+  <status original="1"/>
+</cib>
diff --git a/xml/upgrade-3.10-2.xsl b/xml/upgrade-3.10-2.xsl
new file mode 100644
index 0000000000..bafe032afb
--- /dev/null
+++ b/xml/upgrade-3.10-2.xsl
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Use comments liberally as future maintainers may be unfamiliar with XSLT.
+ -->
+
+<!--
+ upgrade-3.10-2.xsl
+
+ Guarantees after this transformation:
+ -->
+
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+<xsl:import href="upgrade-3.10-common.xsl"/>
+
+<!-- Copy everything unaltered by default -->
+<xsl:template match="/|@*|node()">
+    <xsl:call-template name="identity"/>
+</xsl:template>
+
+</xsl:stylesheet>