diff --git a/cts/schemas/test-3/ref.err/restart-type.ref.err-0 b/cts/schemas/test-3/ref.err/restart-type.ref.err-0
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref.err/restart-type.ref.err-1 b/cts/schemas/test-3/ref.err/restart-type.ref.err-1
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref.err/restart-type.ref.err-2 b/cts/schemas/test-3/ref.err/restart-type.ref.err-2
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref.err/restart-type.ref.err-3 b/cts/schemas/test-3/ref.err/restart-type.ref.err-3
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref.err/restart-type.ref.err-4 b/cts/schemas/test-3/ref.err/restart-type.ref.err-4
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref.err/restart-type.ref.err-99 b/cts/schemas/test-3/ref.err/restart-type.ref.err-99
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/cts/schemas/test-3/ref/restart-type.ref-0 b/cts/schemas/test-3/ref/restart-type.ref-0
new file mode 100644
index 0000000000..be80b80728
--- /dev/null
+++ b/cts/schemas/test-3/ref/restart-type.ref-0
@@ -0,0 +1,98 @@
+<cib crm_feature_set="3.19.7" validate-with="pacemaker-3.10" epoch="8" num_updates="0" admin_epoch="0" original="1">
+  <configuration original="1">
+    <!-- The essential elements of this test are:
+         * There are the following resources:
+           * A template
+           * A primitive outside of any collective resource
+           * A group containing a single member
+           * A cloned primitive
+           * A cloned group containing a single member
+           * A bundle containing a primitive
+         * There is a rsc_defaults element.
+         * Each resource (including nested resources) and the rsc_defaults
+           element have a "restart-type" meta-attribute and one "some-option"
+           meta-attribute.
+
+         In this situation, all restart-type meta-attributes should be removed.
+      -->
+    <crm_config original="1"/>
+    <nodes original="1"/>
+    <resources original="1">
+      <template class="ocf" id="template1" provider="pacemaker" type="Dummy" original="1">
+        <meta_attributes id="template1-meta_attributes" original="1">
+          <nvpair id="template1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="template1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </template>
+      <primitive class="ocf" id="rsc1" provider="pacemaker" type="Dummy" original="1">
+        <meta_attributes id="rsc1-meta_attributes" original="1">
+          <nvpair id="rsc1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="rsc1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </primitive>
+      <group id="grp1" original="1">
+        <primitive class="ocf" id="rsc2" provider="pacemaker" type="Dummy" original="1">
+          <meta_attributes id="rsc2-meta_attributes" original="1">
+            <nvpair id="rsc2-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+            <nvpair id="rsc2-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+          </meta_attributes>
+        </primitive>
+        <meta_attributes id="grp1-meta_attributes" original="1">
+          <nvpair id="grp1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="grp1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </group>
+      <clone id="clone1" original="1">
+        <primitive class="ocf" id="rsc3" provider="pacemaker" type="Dummy" original="1">
+          <meta_attributes id="rsc3-meta_attributes" original="1">
+            <nvpair id="rsc3-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+            <nvpair id="rsc3-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+          </meta_attributes>
+        </primitive>
+        <meta_attributes id="clone1-meta_attributes" original="1">
+          <nvpair id="clone1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="clone1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </clone>
+      <clone id="clone2" original="1">
+        <group id="grp2" original="1">
+          <primitive class="ocf" id="rsc4" provider="pacemaker" type="Dummy" original="1">
+            <meta_attributes id="rsc4-meta_attributes" original="1">
+              <nvpair id="rsc4-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+              <nvpair id="rsc4-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+            </meta_attributes>
+          </primitive>
+          <meta_attributes id="grp2-meta_attributes" original="1">
+            <nvpair id="grp2-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+            <nvpair id="grp2-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+          </meta_attributes>
+        </group>
+        <meta_attributes id="clone2-meta_attributes" original="1">
+          <nvpair id="clone2-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="clone2-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </clone>
+      <bundle id="bundle1" original="1">
+        <podman image="localhost/pcmktest:http" replicas="3" original="1"/>
+        <primitive class="ocf" id="rsc5" provider="heartbeat" type="apache" original="1">
+          <meta_attributes id="rsc5-meta_attributes" original="1">
+            <nvpair id="rsc5-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+            <nvpair id="rsc5-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+          </meta_attributes>
+        </primitive>
+        <meta_attributes id="bundle1-meta_attributes" original="1">
+          <nvpair id="bundle1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="bundle1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </bundle>
+    </resources>
+    <constraints original="1"/>
+    <rsc_defaults original="1">
+      <meta_attributes id="rsc_defaults-meta_attributes" original="1">
+        <nvpair id="rsc_defaults-meta_attributes-restart-type" name="restart-type" value="ignore" original="1"/>
+        <nvpair id="rsc_defaults-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+      </meta_attributes>
+    </rsc_defaults>
+  </configuration>
+  <status original="1"/>
+</cib>
diff --git a/cts/schemas/test-3/ref/restart-type.ref-1 b/cts/schemas/test-3/ref/restart-type.ref-1
new file mode 100644
index 0000000000..514867ff8a
--- /dev/null
+++ b/cts/schemas/test-3/ref/restart-type.ref-1
@@ -0,0 +1,98 @@
+<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 the following resources:
+           * A template
+           * A primitive outside of any collective resource
+           * A group containing a single member
+           * A cloned primitive
+           * A cloned group containing a single member
+           * A bundle containing a primitive
+         * There is a rsc_defaults element.
+         * Each resource (including nested resources) and the rsc_defaults
+           element have a "restart-type" meta-attribute and one "some-option"
+           meta-attribute.
+
+         In this situation, all restart-type meta-attributes should be removed.
+      -->
+    <crm_config original="1"/>
+    <nodes original="1"/>
+    <resources original="1">
+      <template class="ocf" id="template1" provider="pacemaker" type="Dummy" original="1">
+        <meta_attributes id="template1-meta_attributes" original="1">
+          <nvpair id="template1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="template1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </template>
+      <primitive class="ocf" id="rsc1" provider="pacemaker" type="Dummy" original="1">
+        <meta_attributes id="rsc1-meta_attributes" original="1">
+          <nvpair id="rsc1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="rsc1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </primitive>
+      <group id="grp1" original="1">
+        <primitive class="ocf" id="rsc2" provider="pacemaker" type="Dummy" original="1">
+          <meta_attributes id="rsc2-meta_attributes" original="1">
+            <nvpair id="rsc2-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+            <nvpair id="rsc2-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+          </meta_attributes>
+        </primitive>
+        <meta_attributes id="grp1-meta_attributes" original="1">
+          <nvpair id="grp1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="grp1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </group>
+      <clone id="clone1" original="1">
+        <primitive class="ocf" id="rsc3" provider="pacemaker" type="Dummy" original="1">
+          <meta_attributes id="rsc3-meta_attributes" original="1">
+            <nvpair id="rsc3-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+            <nvpair id="rsc3-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+          </meta_attributes>
+        </primitive>
+        <meta_attributes id="clone1-meta_attributes" original="1">
+          <nvpair id="clone1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="clone1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </clone>
+      <clone id="clone2" original="1">
+        <group id="grp2" original="1">
+          <primitive class="ocf" id="rsc4" provider="pacemaker" type="Dummy" original="1">
+            <meta_attributes id="rsc4-meta_attributes" original="1">
+              <nvpair id="rsc4-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+              <nvpair id="rsc4-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+            </meta_attributes>
+          </primitive>
+          <meta_attributes id="grp2-meta_attributes" original="1">
+            <nvpair id="grp2-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+            <nvpair id="grp2-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+          </meta_attributes>
+        </group>
+        <meta_attributes id="clone2-meta_attributes" original="1">
+          <nvpair id="clone2-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="clone2-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </clone>
+      <bundle id="bundle1" original="1">
+        <podman image="localhost/pcmktest:http" replicas="3" original="1"/>
+        <primitive class="ocf" id="rsc5" provider="heartbeat" type="apache" original="1">
+          <meta_attributes id="rsc5-meta_attributes" original="1">
+            <nvpair id="rsc5-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+            <nvpair id="rsc5-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+          </meta_attributes>
+        </primitive>
+        <meta_attributes id="bundle1-meta_attributes" original="1">
+          <nvpair id="bundle1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="bundle1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </bundle>
+    </resources>
+    <constraints original="1"/>
+    <rsc_defaults original="1">
+      <meta_attributes id="rsc_defaults-meta_attributes" original="1">
+        <nvpair id="rsc_defaults-meta_attributes-restart-type" name="restart-type" value="ignore" original="1"/>
+        <nvpair id="rsc_defaults-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+      </meta_attributes>
+    </rsc_defaults>
+  </configuration>
+  <status original="1"/>
+</cib>
diff --git a/cts/schemas/test-3/ref/restart-type.ref-2 b/cts/schemas/test-3/ref/restart-type.ref-2
new file mode 100644
index 0000000000..514867ff8a
--- /dev/null
+++ b/cts/schemas/test-3/ref/restart-type.ref-2
@@ -0,0 +1,98 @@
+<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 the following resources:
+           * A template
+           * A primitive outside of any collective resource
+           * A group containing a single member
+           * A cloned primitive
+           * A cloned group containing a single member
+           * A bundle containing a primitive
+         * There is a rsc_defaults element.
+         * Each resource (including nested resources) and the rsc_defaults
+           element have a "restart-type" meta-attribute and one "some-option"
+           meta-attribute.
+
+         In this situation, all restart-type meta-attributes should be removed.
+      -->
+    <crm_config original="1"/>
+    <nodes original="1"/>
+    <resources original="1">
+      <template class="ocf" id="template1" provider="pacemaker" type="Dummy" original="1">
+        <meta_attributes id="template1-meta_attributes" original="1">
+          <nvpair id="template1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="template1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </template>
+      <primitive class="ocf" id="rsc1" provider="pacemaker" type="Dummy" original="1">
+        <meta_attributes id="rsc1-meta_attributes" original="1">
+          <nvpair id="rsc1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="rsc1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </primitive>
+      <group id="grp1" original="1">
+        <primitive class="ocf" id="rsc2" provider="pacemaker" type="Dummy" original="1">
+          <meta_attributes id="rsc2-meta_attributes" original="1">
+            <nvpair id="rsc2-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+            <nvpair id="rsc2-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+          </meta_attributes>
+        </primitive>
+        <meta_attributes id="grp1-meta_attributes" original="1">
+          <nvpair id="grp1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="grp1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </group>
+      <clone id="clone1" original="1">
+        <primitive class="ocf" id="rsc3" provider="pacemaker" type="Dummy" original="1">
+          <meta_attributes id="rsc3-meta_attributes" original="1">
+            <nvpair id="rsc3-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+            <nvpair id="rsc3-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+          </meta_attributes>
+        </primitive>
+        <meta_attributes id="clone1-meta_attributes" original="1">
+          <nvpair id="clone1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="clone1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </clone>
+      <clone id="clone2" original="1">
+        <group id="grp2" original="1">
+          <primitive class="ocf" id="rsc4" provider="pacemaker" type="Dummy" original="1">
+            <meta_attributes id="rsc4-meta_attributes" original="1">
+              <nvpair id="rsc4-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+              <nvpair id="rsc4-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+            </meta_attributes>
+          </primitive>
+          <meta_attributes id="grp2-meta_attributes" original="1">
+            <nvpair id="grp2-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+            <nvpair id="grp2-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+          </meta_attributes>
+        </group>
+        <meta_attributes id="clone2-meta_attributes" original="1">
+          <nvpair id="clone2-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="clone2-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </clone>
+      <bundle id="bundle1" original="1">
+        <podman image="localhost/pcmktest:http" replicas="3" original="1"/>
+        <primitive class="ocf" id="rsc5" provider="heartbeat" type="apache" original="1">
+          <meta_attributes id="rsc5-meta_attributes" original="1">
+            <nvpair id="rsc5-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+            <nvpair id="rsc5-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+          </meta_attributes>
+        </primitive>
+        <meta_attributes id="bundle1-meta_attributes" original="1">
+          <nvpair id="bundle1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="bundle1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </bundle>
+    </resources>
+    <constraints original="1"/>
+    <rsc_defaults original="1">
+      <meta_attributes id="rsc_defaults-meta_attributes" original="1">
+        <nvpair id="rsc_defaults-meta_attributes-restart-type" name="restart-type" value="ignore" original="1"/>
+        <nvpair id="rsc_defaults-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+      </meta_attributes>
+    </rsc_defaults>
+  </configuration>
+  <status original="1"/>
+</cib>
diff --git a/cts/schemas/test-3/ref/restart-type.ref-3 b/cts/schemas/test-3/ref/restart-type.ref-3
new file mode 100644
index 0000000000..514867ff8a
--- /dev/null
+++ b/cts/schemas/test-3/ref/restart-type.ref-3
@@ -0,0 +1,98 @@
+<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 the following resources:
+           * A template
+           * A primitive outside of any collective resource
+           * A group containing a single member
+           * A cloned primitive
+           * A cloned group containing a single member
+           * A bundle containing a primitive
+         * There is a rsc_defaults element.
+         * Each resource (including nested resources) and the rsc_defaults
+           element have a "restart-type" meta-attribute and one "some-option"
+           meta-attribute.
+
+         In this situation, all restart-type meta-attributes should be removed.
+      -->
+    <crm_config original="1"/>
+    <nodes original="1"/>
+    <resources original="1">
+      <template class="ocf" id="template1" provider="pacemaker" type="Dummy" original="1">
+        <meta_attributes id="template1-meta_attributes" original="1">
+          <nvpair id="template1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="template1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </template>
+      <primitive class="ocf" id="rsc1" provider="pacemaker" type="Dummy" original="1">
+        <meta_attributes id="rsc1-meta_attributes" original="1">
+          <nvpair id="rsc1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="rsc1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </primitive>
+      <group id="grp1" original="1">
+        <primitive class="ocf" id="rsc2" provider="pacemaker" type="Dummy" original="1">
+          <meta_attributes id="rsc2-meta_attributes" original="1">
+            <nvpair id="rsc2-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+            <nvpair id="rsc2-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+          </meta_attributes>
+        </primitive>
+        <meta_attributes id="grp1-meta_attributes" original="1">
+          <nvpair id="grp1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="grp1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </group>
+      <clone id="clone1" original="1">
+        <primitive class="ocf" id="rsc3" provider="pacemaker" type="Dummy" original="1">
+          <meta_attributes id="rsc3-meta_attributes" original="1">
+            <nvpair id="rsc3-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+            <nvpair id="rsc3-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+          </meta_attributes>
+        </primitive>
+        <meta_attributes id="clone1-meta_attributes" original="1">
+          <nvpair id="clone1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="clone1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </clone>
+      <clone id="clone2" original="1">
+        <group id="grp2" original="1">
+          <primitive class="ocf" id="rsc4" provider="pacemaker" type="Dummy" original="1">
+            <meta_attributes id="rsc4-meta_attributes" original="1">
+              <nvpair id="rsc4-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+              <nvpair id="rsc4-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+            </meta_attributes>
+          </primitive>
+          <meta_attributes id="grp2-meta_attributes" original="1">
+            <nvpair id="grp2-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+            <nvpair id="grp2-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+          </meta_attributes>
+        </group>
+        <meta_attributes id="clone2-meta_attributes" original="1">
+          <nvpair id="clone2-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="clone2-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </clone>
+      <bundle id="bundle1" original="1">
+        <podman image="localhost/pcmktest:http" replicas="3" original="1"/>
+        <primitive class="ocf" id="rsc5" provider="heartbeat" type="apache" original="1">
+          <meta_attributes id="rsc5-meta_attributes" original="1">
+            <nvpair id="rsc5-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+            <nvpair id="rsc5-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+          </meta_attributes>
+        </primitive>
+        <meta_attributes id="bundle1-meta_attributes" original="1">
+          <nvpair id="bundle1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="bundle1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </bundle>
+    </resources>
+    <constraints original="1"/>
+    <rsc_defaults original="1">
+      <meta_attributes id="rsc_defaults-meta_attributes" original="1">
+        <nvpair id="rsc_defaults-meta_attributes-restart-type" name="restart-type" value="ignore" original="1"/>
+        <nvpair id="rsc_defaults-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+      </meta_attributes>
+    </rsc_defaults>
+  </configuration>
+  <status original="1"/>
+</cib>
diff --git a/cts/schemas/test-3/ref/restart-type.ref-4 b/cts/schemas/test-3/ref/restart-type.ref-4
new file mode 100644
index 0000000000..514867ff8a
--- /dev/null
+++ b/cts/schemas/test-3/ref/restart-type.ref-4
@@ -0,0 +1,98 @@
+<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 the following resources:
+           * A template
+           * A primitive outside of any collective resource
+           * A group containing a single member
+           * A cloned primitive
+           * A cloned group containing a single member
+           * A bundle containing a primitive
+         * There is a rsc_defaults element.
+         * Each resource (including nested resources) and the rsc_defaults
+           element have a "restart-type" meta-attribute and one "some-option"
+           meta-attribute.
+
+         In this situation, all restart-type meta-attributes should be removed.
+      -->
+    <crm_config original="1"/>
+    <nodes original="1"/>
+    <resources original="1">
+      <template class="ocf" id="template1" provider="pacemaker" type="Dummy" original="1">
+        <meta_attributes id="template1-meta_attributes" original="1">
+          <nvpair id="template1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="template1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </template>
+      <primitive class="ocf" id="rsc1" provider="pacemaker" type="Dummy" original="1">
+        <meta_attributes id="rsc1-meta_attributes" original="1">
+          <nvpair id="rsc1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="rsc1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </primitive>
+      <group id="grp1" original="1">
+        <primitive class="ocf" id="rsc2" provider="pacemaker" type="Dummy" original="1">
+          <meta_attributes id="rsc2-meta_attributes" original="1">
+            <nvpair id="rsc2-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+            <nvpair id="rsc2-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+          </meta_attributes>
+        </primitive>
+        <meta_attributes id="grp1-meta_attributes" original="1">
+          <nvpair id="grp1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="grp1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </group>
+      <clone id="clone1" original="1">
+        <primitive class="ocf" id="rsc3" provider="pacemaker" type="Dummy" original="1">
+          <meta_attributes id="rsc3-meta_attributes" original="1">
+            <nvpair id="rsc3-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+            <nvpair id="rsc3-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+          </meta_attributes>
+        </primitive>
+        <meta_attributes id="clone1-meta_attributes" original="1">
+          <nvpair id="clone1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="clone1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </clone>
+      <clone id="clone2" original="1">
+        <group id="grp2" original="1">
+          <primitive class="ocf" id="rsc4" provider="pacemaker" type="Dummy" original="1">
+            <meta_attributes id="rsc4-meta_attributes" original="1">
+              <nvpair id="rsc4-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+              <nvpair id="rsc4-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+            </meta_attributes>
+          </primitive>
+          <meta_attributes id="grp2-meta_attributes" original="1">
+            <nvpair id="grp2-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+            <nvpair id="grp2-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+          </meta_attributes>
+        </group>
+        <meta_attributes id="clone2-meta_attributes" original="1">
+          <nvpair id="clone2-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="clone2-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </clone>
+      <bundle id="bundle1" original="1">
+        <podman image="localhost/pcmktest:http" replicas="3" original="1"/>
+        <primitive class="ocf" id="rsc5" provider="heartbeat" type="apache" original="1">
+          <meta_attributes id="rsc5-meta_attributes" original="1">
+            <nvpair id="rsc5-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+            <nvpair id="rsc5-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+          </meta_attributes>
+        </primitive>
+        <meta_attributes id="bundle1-meta_attributes" original="1">
+          <nvpair id="bundle1-meta_attributes-restart-type" name="restart-type" value="restart" original="1"/>
+          <nvpair id="bundle1-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+        </meta_attributes>
+      </bundle>
+    </resources>
+    <constraints original="1"/>
+    <rsc_defaults original="1">
+      <meta_attributes id="rsc_defaults-meta_attributes" original="1">
+        <nvpair id="rsc_defaults-meta_attributes-restart-type" name="restart-type" value="ignore" original="1"/>
+        <nvpair id="rsc_defaults-meta_attributes-some-option" name="some-option" value="some-value" original="1"/>
+      </meta_attributes>
+    </rsc_defaults>
+  </configuration>
+  <status original="1"/>
+</cib>
diff --git a/cts/schemas/test-3/ref/restart-type.ref-99 b/cts/schemas/test-3/ref/restart-type.ref-99
new file mode 100644
index 0000000000..f866b477b9
--- /dev/null
+++ b/cts/schemas/test-3/ref/restart-type.ref-99
@@ -0,0 +1,98 @@
+<cib crm_feature_set="3.19.7" validate-with="pacemaker-4.0" epoch="8" num_updates="0" admin_epoch="0">
+  <configuration>
+    <!-- The essential elements of this test are:
+         * There are the following resources:
+           * A template
+           * A primitive outside of any collective resource
+           * A group containing a single member
+           * A cloned primitive
+           * A cloned group containing a single member
+           * A bundle containing a primitive
+         * There is a rsc_defaults element.
+         * Each resource (including nested resources) and the rsc_defaults
+           element have a "restart-type" meta-attribute and one "some-option"
+           meta-attribute.
+
+         In this situation, all restart-type meta-attributes should be removed.
+      -->
+    <crm_config/>
+    <nodes/>
+    <resources>
+      <template class="ocf" id="template1" provider="pacemaker" type="Dummy">
+        <meta_attributes id="template1-meta_attributes">
+          <nvpair id="template1-meta_attributes-restart-type" name="restart-type" value="restart"/>
+          <nvpair id="template1-meta_attributes-some-option" name="some-option" value="some-value"/>
+        </meta_attributes>
+      </template>
+      <primitive class="ocf" id="rsc1" provider="pacemaker" type="Dummy">
+        <meta_attributes id="rsc1-meta_attributes">
+          <nvpair id="rsc1-meta_attributes-restart-type" name="restart-type" value="restart"/>
+          <nvpair id="rsc1-meta_attributes-some-option" name="some-option" value="some-value"/>
+        </meta_attributes>
+      </primitive>
+      <group id="grp1">
+        <primitive class="ocf" id="rsc2" provider="pacemaker" type="Dummy">
+          <meta_attributes id="rsc2-meta_attributes">
+            <nvpair id="rsc2-meta_attributes-restart-type" name="restart-type" value="restart"/>
+            <nvpair id="rsc2-meta_attributes-some-option" name="some-option" value="some-value"/>
+          </meta_attributes>
+        </primitive>
+        <meta_attributes id="grp1-meta_attributes">
+          <nvpair id="grp1-meta_attributes-restart-type" name="restart-type" value="restart"/>
+          <nvpair id="grp1-meta_attributes-some-option" name="some-option" value="some-value"/>
+        </meta_attributes>
+      </group>
+      <clone id="clone1">
+        <primitive class="ocf" id="rsc3" provider="pacemaker" type="Dummy">
+          <meta_attributes id="rsc3-meta_attributes">
+            <nvpair id="rsc3-meta_attributes-restart-type" name="restart-type" value="restart"/>
+            <nvpair id="rsc3-meta_attributes-some-option" name="some-option" value="some-value"/>
+          </meta_attributes>
+        </primitive>
+        <meta_attributes id="clone1-meta_attributes">
+          <nvpair id="clone1-meta_attributes-restart-type" name="restart-type" value="restart"/>
+          <nvpair id="clone1-meta_attributes-some-option" name="some-option" value="some-value"/>
+        </meta_attributes>
+      </clone>
+      <clone id="clone2">
+        <group id="grp2">
+          <primitive class="ocf" id="rsc4" provider="pacemaker" type="Dummy">
+            <meta_attributes id="rsc4-meta_attributes">
+              <nvpair id="rsc4-meta_attributes-restart-type" name="restart-type" value="restart"/>
+              <nvpair id="rsc4-meta_attributes-some-option" name="some-option" value="some-value"/>
+            </meta_attributes>
+          </primitive>
+          <meta_attributes id="grp2-meta_attributes">
+            <nvpair id="grp2-meta_attributes-restart-type" name="restart-type" value="restart"/>
+            <nvpair id="grp2-meta_attributes-some-option" name="some-option" value="some-value"/>
+          </meta_attributes>
+        </group>
+        <meta_attributes id="clone2-meta_attributes">
+          <nvpair id="clone2-meta_attributes-restart-type" name="restart-type" value="restart"/>
+          <nvpair id="clone2-meta_attributes-some-option" name="some-option" value="some-value"/>
+        </meta_attributes>
+      </clone>
+      <bundle id="bundle1">
+        <podman image="localhost/pcmktest:http" replicas="3"/>
+        <primitive class="ocf" id="rsc5" provider="heartbeat" type="apache">
+          <meta_attributes id="rsc5-meta_attributes">
+            <nvpair id="rsc5-meta_attributes-restart-type" name="restart-type" value="restart"/>
+            <nvpair id="rsc5-meta_attributes-some-option" name="some-option" value="some-value"/>
+          </meta_attributes>
+        </primitive>
+        <meta_attributes id="bundle1-meta_attributes">
+          <nvpair id="bundle1-meta_attributes-restart-type" name="restart-type" value="restart"/>
+          <nvpair id="bundle1-meta_attributes-some-option" name="some-option" value="some-value"/>
+        </meta_attributes>
+      </bundle>
+    </resources>
+    <constraints/>
+    <rsc_defaults>
+      <meta_attributes id="rsc_defaults-meta_attributes">
+        <nvpair id="rsc_defaults-meta_attributes-restart-type" name="restart-type" value="ignore"/>
+        <nvpair id="rsc_defaults-meta_attributes-some-option" name="some-option" value="some-value"/>
+      </meta_attributes>
+    </rsc_defaults>
+  </configuration>
+  <status/>
+</cib>
diff --git a/cts/schemas/test-3/xml/restart-type.xml b/cts/schemas/test-3/xml/restart-type.xml
new file mode 100644
index 0000000000..2b66d3b449
--- /dev/null
+++ b/cts/schemas/test-3/xml/restart-type.xml
@@ -0,0 +1,98 @@
+<cib crm_feature_set="3.19.7" validate-with="pacemaker-3.10" epoch="8" num_updates="0" admin_epoch="0">
+  <configuration>
+    <!-- The essential elements of this test are:
+         * There are the following resources:
+           * A template
+           * A primitive outside of any collective resource
+           * A group containing a single member
+           * A cloned primitive
+           * A cloned group containing a single member
+           * A bundle containing a primitive
+         * There is a rsc_defaults element.
+         * Each resource (including nested resources) and the rsc_defaults
+           element have a "restart-type" meta-attribute and one "some-option"
+           meta-attribute.
+
+         In this situation, all restart-type meta-attributes should be removed.
+      -->
+    <crm_config/>
+    <nodes/>
+    <resources>
+      <template class="ocf" id="template1" provider="pacemaker" type="Dummy">
+        <meta_attributes id="template1-meta_attributes">
+          <nvpair id="template1-meta_attributes-restart-type" name="restart-type" value="restart"/>
+          <nvpair id="template1-meta_attributes-some-option" name="some-option" value="some-value"/>
+        </meta_attributes>
+      </template>
+      <primitive class="ocf" id="rsc1" provider="pacemaker" type="Dummy">
+        <meta_attributes id="rsc1-meta_attributes">
+          <nvpair id="rsc1-meta_attributes-restart-type" name="restart-type" value="restart"/>
+          <nvpair id="rsc1-meta_attributes-some-option" name="some-option" value="some-value"/>
+        </meta_attributes>
+      </primitive>
+      <group id="grp1">
+        <primitive class="ocf" id="rsc2" provider="pacemaker" type="Dummy">
+          <meta_attributes id="rsc2-meta_attributes">
+            <nvpair id="rsc2-meta_attributes-restart-type" name="restart-type" value="restart"/>
+            <nvpair id="rsc2-meta_attributes-some-option" name="some-option" value="some-value"/>
+          </meta_attributes>
+        </primitive>
+        <meta_attributes id="grp1-meta_attributes">
+          <nvpair id="grp1-meta_attributes-restart-type" name="restart-type" value="restart"/>
+          <nvpair id="grp1-meta_attributes-some-option" name="some-option" value="some-value"/>
+        </meta_attributes>
+      </group>
+      <clone id="clone1">
+        <primitive class="ocf" id="rsc3" provider="pacemaker" type="Dummy">
+          <meta_attributes id="rsc3-meta_attributes">
+            <nvpair id="rsc3-meta_attributes-restart-type" name="restart-type" value="restart"/>
+            <nvpair id="rsc3-meta_attributes-some-option" name="some-option" value="some-value"/>
+          </meta_attributes>
+        </primitive>
+        <meta_attributes id="clone1-meta_attributes">
+          <nvpair id="clone1-meta_attributes-restart-type" name="restart-type" value="restart"/>
+          <nvpair id="clone1-meta_attributes-some-option" name="some-option" value="some-value"/>
+        </meta_attributes>
+      </clone>
+      <clone id="clone2">
+        <group id="grp2">
+          <primitive class="ocf" id="rsc4" provider="pacemaker" type="Dummy">
+            <meta_attributes id="rsc4-meta_attributes">
+              <nvpair id="rsc4-meta_attributes-restart-type" name="restart-type" value="restart"/>
+              <nvpair id="rsc4-meta_attributes-some-option" name="some-option" value="some-value"/>
+            </meta_attributes>
+          </primitive>
+          <meta_attributes id="grp2-meta_attributes">
+            <nvpair id="grp2-meta_attributes-restart-type" name="restart-type" value="restart"/>
+            <nvpair id="grp2-meta_attributes-some-option" name="some-option" value="some-value"/>
+          </meta_attributes>
+        </group>
+        <meta_attributes id="clone2-meta_attributes">
+          <nvpair id="clone2-meta_attributes-restart-type" name="restart-type" value="restart"/>
+          <nvpair id="clone2-meta_attributes-some-option" name="some-option" value="some-value"/>
+        </meta_attributes>
+      </clone>
+      <bundle id="bundle1">
+        <podman image="localhost/pcmktest:http" replicas="3"/>
+        <primitive class="ocf" id="rsc5" provider="heartbeat" type="apache">
+          <meta_attributes id="rsc5-meta_attributes">
+            <nvpair id="rsc5-meta_attributes-restart-type" name="restart-type" value="restart"/>
+            <nvpair id="rsc5-meta_attributes-some-option" name="some-option" value="some-value"/>
+          </meta_attributes>
+        </primitive>
+        <meta_attributes id="bundle1-meta_attributes">
+          <nvpair id="bundle1-meta_attributes-restart-type" name="restart-type" value="restart"/>
+          <nvpair id="bundle1-meta_attributes-some-option" name="some-option" value="some-value"/>
+        </meta_attributes>
+      </bundle>
+    </resources>
+    <constraints/>
+    <rsc_defaults>
+      <meta_attributes id="rsc_defaults-meta_attributes">
+        <nvpair id="rsc_defaults-meta_attributes-restart-type" name="restart-type" value="ignore"/>
+        <nvpair id="rsc_defaults-meta_attributes-some-option" name="some-option" value="some-value"/>
+      </meta_attributes>
+    </rsc_defaults>
+  </configuration>
+  <status/>
+</cib>