diff --git a/pengine/test10/target-1.dot b/pengine/test10/target-1.dot
index 8f55aa2f9b..aed14fe52b 100644
--- a/pengine/test10/target-1.dot
+++ b/pengine/test10/target-1.dot
@@ -1,48 +1,46 @@
  digraph "g" {
-"Cancel rsc_c001n03_monitor_5000 c001n03" -> "rsc_c001n03_promote_0 c001n03" [ style = bold]
-"Cancel rsc_c001n03_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black"  ]
+"Cancel rsc_c001n03:0_monitor_5000 c001n03" -> "rsc_c001n03:0_promote_0 c001n03" [ style = bold]
+"Cancel rsc_c001n03:0_monitor_5000 c001n03" [ style=bold color="green" fontcolor="black"  ]
 "DcIPaddr_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
 "DcIPaddr_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
 "DcIPaddr_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "DcIPaddr_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
 "DcIPaddr_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "all_stopped" [ style=bold color="green" fontcolor="orange"  ]
 "probe_complete c001n01" -> "probe_complete" [ style = bold]
 "probe_complete c001n01" [ style=bold color="green" fontcolor="black" ]
 "probe_complete c001n02" -> "probe_complete" [ style = bold]
 "probe_complete c001n02" [ style=bold color="green" fontcolor="black" ]
 "probe_complete c001n03" -> "probe_complete" [ style = bold]
 "probe_complete c001n03" [ style=bold color="green" fontcolor="black" ]
 "probe_complete c001n08" -> "probe_complete" [ style = bold]
 "probe_complete c001n08" [ style=bold color="green" fontcolor="black" ]
 "probe_complete" -> "rsc_c001n08_stop_0 c001n08" [ style = bold]
 "probe_complete" [ style=bold color="green" fontcolor="orange" ]
+"promoteme_promote_0" -> "rsc_c001n03:0_promote_0 c001n03" [ style = bold]
+"promoteme_promote_0" [ style=bold color="green" fontcolor="orange"  ]
+"promoteme_promoted_0" [ style=bold color="green" fontcolor="orange"  ]
 "rsc_c001n01_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
 "rsc_c001n01_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n01_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
 "rsc_c001n01_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n01_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
 "rsc_c001n01_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
 "rsc_c001n02_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
 "rsc_c001n02_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n02_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
 "rsc_c001n02_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
-"rsc_c001n03_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
-"rsc_c001n03_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
-"rsc_c001n03_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
-"rsc_c001n03_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
-"rsc_c001n03_monitor_0 c001n08" -> "probe_complete c001n08" [ style = bold]
-"rsc_c001n03_monitor_0 c001n08" [ style=bold color="green" fontcolor="black" ]
-"rsc_c001n03_promote_0 c001n03" [ style=bold color="green" fontcolor="black" ]
+"rsc_c001n03:0_promote_0 c001n03" -> "promoteme_promoted_0" [ style = bold]
+"rsc_c001n03:0_promote_0 c001n03" [ style=bold color="green" fontcolor="black"  ]
 "rsc_c001n08_monitor_0 c001n01" -> "probe_complete c001n01" [ style = bold]
 "rsc_c001n08_monitor_0 c001n01" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n08_monitor_0 c001n02" -> "probe_complete c001n02" [ style = bold]
 "rsc_c001n08_monitor_0 c001n02" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n08_monitor_0 c001n03" -> "probe_complete c001n03" [ style = bold]
 "rsc_c001n08_monitor_0 c001n03" [ style=bold color="green" fontcolor="black" ]
 "rsc_c001n08_stop_0 c001n08" -> "all_stopped" [ style = bold]
 "rsc_c001n08_stop_0 c001n08" [ style=bold color="green" fontcolor="black" ]
 }
diff --git a/pengine/test10/target-1.exp b/pengine/test10/target-1.exp
index 5200a30eea..1403edc820 100644
--- a/pengine/test10/target-1.exp
+++ b/pengine/test10/target-1.exp
@@ -1,287 +1,274 @@
  <transition_graph cluster-delay="3m" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
    <synapse id="0">
      <action_set>
        <rsc_op id="9" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="DcIPaddr" long-id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.1" ip="127.0.0.10" target_role="Started"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="1">
      <action_set>
-       <rsc_op id="18" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="16" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="DcIPaddr" long-id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.1" ip="127.0.0.10" target_role="Started"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="2">
      <action_set>
-       <rsc_op id="23" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+      <rsc_op id="21" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="DcIPaddr" long-id="DcIPaddr" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.1" ip="127.0.0.10" target_role="Started"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="3">
      <action_set>
-       <rsc_op id="14" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="13" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="rsc_c001n08" long-id="rsc_c001n08" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.1" ip="127.0.0.11" target_role="Stopped"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="4">
      <action_set>
-       <rsc_op id="19" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="17" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="rsc_c001n08" long-id="rsc_c001n08" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.1" ip="127.0.0.11" target_role="Stopped"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="5">
      <action_set>
-       <rsc_op id="24" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+      <rsc_op id="22" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="rsc_c001n08" long-id="rsc_c001n08" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.1" ip="127.0.0.11" target_role="Stopped"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="6">
      <action_set>
-       <rsc_op id="29" operation="stop" operation_key="rsc_c001n08_stop_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+      <rsc_op id="26" operation="stop" operation_key="rsc_c001n08_stop_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="rsc_c001n08" long-id="rsc_c001n08" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <pseudo_event id="7" operation="probe_complete" operation_key="probe_complete"/>
        </trigger>
      </inputs>
    </synapse>
    <synapse id="7">
      <action_set>
        <rsc_op id="10" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="rsc_c001n02" long-id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.1" ip="127.0.0.12" target_role="Slave"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="8">
      <action_set>
-       <rsc_op id="20" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="18" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="rsc_c001n02" long-id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.1" ip="127.0.0.12" target_role="Slave"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="9">
      <action_set>
-       <rsc_op id="25" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+      <rsc_op id="23" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <primitive id="rsc_c001n02" long-id="rsc_c001n02" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.1" ip="127.0.0.12" target_role="Slave"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="10">
      <action_set>
-       <rsc_op id="4" operation="cancel" operation_key="rsc_c001n03_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
-         <primitive id="rsc_c001n03" long-id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr"/>
-         <attributes CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_operation="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.1" ip="127.0.0.13" target_role="Master"/>
+      <rsc_op id="4" operation="cancel" operation_key="rsc_c001n03:0_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+        <primitive id="rsc_c001n03:0" long-id="promoteme:rsc_c001n03:0" class="ocf" provider="heartbeat" type="IPaddr"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_globally_unique="false" CRM_meta_interval="5000" CRM_meta_name="monitor" CRM_meta_operation="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.1" ip="127.0.0.13" target_role="Master"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
    <synapse id="11">
      <action_set>
-       <rsc_op id="11" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
-         <primitive id="rsc_c001n03" long-id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr"/>
-         <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.1" ip="127.0.0.13" target_role="Master"/>
+      <rsc_op id="32" operation="promote" operation_key="rsc_c001n03:0_promote_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+        <primitive id="rsc_c001n03:0" long-id="promoteme:rsc_c001n03:0" class="ocf" provider="heartbeat" type="IPaddr"/>
+        <attributes CRM_meta_clone="0" CRM_meta_clone_max="1" CRM_meta_globally_unique="false" CRM_meta_timeout="20000" crm_feature_set="3.0.1" ip="127.0.0.13" target_role="Master"/>
        </rsc_op>
      </action_set>
-     <inputs/>
+    <inputs>
+      <trigger>
+        <rsc_op id="4" operation="cancel" operation_key="rsc_c001n03:0_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+      </trigger>
+      <trigger>
+        <pseudo_event id="37" operation="promote" operation_key="promoteme_promote_0"/>
+      </trigger>
+    </inputs>
    </synapse>
    <synapse id="12">
      <action_set>
-       <rsc_op id="15" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
-         <primitive id="rsc_c001n03" long-id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr"/>
-         <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.1" ip="127.0.0.13" target_role="Master"/>
-       </rsc_op>
-     </action_set>
-     <inputs/>
-   </synapse>
-   <synapse id="13">
-     <action_set>
-       <rsc_op id="26" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
-         <primitive id="rsc_c001n03" long-id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr"/>
-         <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.1" ip="127.0.0.13" target_role="Master"/>
-       </rsc_op>
+      <pseudo_event id="37" operation="promote" operation_key="promoteme_promote_0">
+        <attributes CRM_meta_clone_max="1" CRM_meta_globally_unique="false" CRM_meta_timeout="20000" crm_feature_set="3.0.1"/>
+      </pseudo_event>
      </action_set>
      <inputs/>
    </synapse>
-   <synapse id="14">
+  <synapse id="13" priority="1000000">
      <action_set>
-       <rsc_op id="36" operation="promote" operation_key="rsc_c001n03_promote_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
-         <primitive id="rsc_c001n03" long-id="rsc_c001n03" class="ocf" provider="heartbeat" type="IPaddr"/>
-         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.1" ip="127.0.0.13" target_role="Master"/>
-       </rsc_op>
+      <pseudo_event id="38" operation="promoted" operation_key="promoteme_promoted_0">
+        <attributes CRM_meta_clone_max="1" CRM_meta_globally_unique="false" CRM_meta_timeout="20000" crm_feature_set="3.0.1"/>
+      </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="4" operation="cancel" operation_key="rsc_c001n03_monitor_5000" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="32" operation="promote" operation_key="rsc_c001n03:0_promote_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="15">
+  <synapse id="14">
      <action_set>
-       <rsc_op id="12" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
+      <rsc_op id="11" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <primitive id="rsc_c001n01" long-id="rsc_c001n01" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.1" ip="127.0.0.14"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
-   <synapse id="16">
+  <synapse id="15">
      <action_set>
-       <rsc_op id="16" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="14" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <primitive id="rsc_c001n01" long-id="rsc_c001n01" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.1" ip="127.0.0.14"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
-   <synapse id="17">
+  <synapse id="16">
      <action_set>
-       <rsc_op id="21" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="19" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <primitive id="rsc_c001n01" long-id="rsc_c001n01" class="ocf" provider="heartbeat" type="IPaddr"/>
          <attributes CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.1" ip="127.0.0.14"/>
        </rsc_op>
      </action_set>
      <inputs/>
    </synapse>
-   <synapse id="18">
+  <synapse id="17">
      <action_set>
        <pseudo_event id="6" operation="all_stopped" operation_key="all_stopped">
          <attributes crm_feature_set="3.0.1"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="29" operation="stop" operation_key="rsc_c001n08_stop_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+        <rsc_op id="26" operation="stop" operation_key="rsc_c001n08_stop_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="19">
+  <synapse id="18">
      <action_set>
        <pseudo_event id="7" operation="probe_complete" operation_key="probe_complete">
          <attributes crm_feature_set="3.0.1"/>
        </pseudo_event>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
        <trigger>
-         <rsc_op id="13" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="12" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
-         <rsc_op id="17" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="15" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
        <trigger>
-         <rsc_op id="22" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <rsc_op id="20" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="20" priority="1000000">
+  <synapse id="19" priority="1000000">
      <action_set>
        <rsc_op id="8" operation="probe_complete" operation_key="probe_complete" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b">
          <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
          <rsc_op id="9" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
        <trigger>
          <rsc_op id="10" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
        <trigger>
-         <rsc_op id="11" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
-       </trigger>
-       <trigger>
-         <rsc_op id="12" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
+        <rsc_op id="11" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n08" on_node_uuid="6427cb5a-c7a5-4bdf-9892-a04ce56f4e6b"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="21" priority="1000000">
+  <synapse id="20" priority="1000000">
      <action_set>
-       <rsc_op id="13" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
+      <rsc_op id="12" operation="probe_complete" operation_key="probe_complete" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f">
          <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="14" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="13" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
        <trigger>
-         <rsc_op id="15" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
-       </trigger>
-       <trigger>
-         <rsc_op id="16" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
+        <rsc_op id="14" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n02" on_node_uuid="e9bdfde9-01b0-421f-acd8-8a65a53e775f"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="22" priority="1000000">
+  <synapse id="21" priority="1000000">
      <action_set>
-       <rsc_op id="17" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
+      <rsc_op id="15" operation="probe_complete" operation_key="probe_complete" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193">
          <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="18" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="16" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
        <trigger>
-         <rsc_op id="19" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="17" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
        <trigger>
-         <rsc_op id="20" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="18" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
        <trigger>
-         <rsc_op id="21" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
+        <rsc_op id="19" operation="monitor" operation_key="rsc_c001n01_monitor_0" on_node="c001n03" on_node_uuid="5d9a8c11-8684-43ea-91.0.6e221530c193"/>
        </trigger>
      </inputs>
    </synapse>
-   <synapse id="23" priority="1000000">
+  <synapse id="22" priority="1000000">
      <action_set>
-       <rsc_op id="22" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
+      <rsc_op id="20" operation="probe_complete" operation_key="probe_complete" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3">
          <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.1"/>
        </rsc_op>
      </action_set>
      <inputs>
        <trigger>
-         <rsc_op id="23" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
-       </trigger>
-       <trigger>
-         <rsc_op id="24" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <rsc_op id="21" operation="monitor" operation_key="DcIPaddr_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
        <trigger>
-         <rsc_op id="25" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <rsc_op id="22" operation="monitor" operation_key="rsc_c001n08_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
        <trigger>
-         <rsc_op id="26" operation="monitor" operation_key="rsc_c001n03_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
+        <rsc_op id="23" operation="monitor" operation_key="rsc_c001n02_monitor_0" on_node="c001n01" on_node_uuid="de937e3d-0309-4b5d-b85c-f96edc1ed8e3"/>
        </trigger>
      </inputs>
    </synapse>
  </transition_graph>
 
diff --git a/pengine/test10/target-1.scores b/pengine/test10/target-1.scores
index 2565ebda5a..02ef219d33 100644
--- a/pengine/test10/target-1.scores
+++ b/pengine/test10/target-1.scores
@@ -1,21 +1,31 @@
 Allocation scores:
 native_color: DcIPaddr allocation score on c001n08: -1000000
 native_color: DcIPaddr allocation score on c001n02: 0
 native_color: DcIPaddr allocation score on c001n03: -1000000
 native_color: DcIPaddr allocation score on c001n01: -1000000
 native_color: rsc_c001n08 allocation score on c001n08: -1000000
 native_color: rsc_c001n08 allocation score on c001n02: -1000000
 native_color: rsc_c001n08 allocation score on c001n03: -1000000
 native_color: rsc_c001n08 allocation score on c001n01: -1000000
 native_color: rsc_c001n02 allocation score on c001n08: 0
 native_color: rsc_c001n02 allocation score on c001n02: 100
 native_color: rsc_c001n02 allocation score on c001n03: 0
 native_color: rsc_c001n02 allocation score on c001n01: 0
-native_color: rsc_c001n03 allocation score on c001n08: 0
-native_color: rsc_c001n03 allocation score on c001n02: 0
-native_color: rsc_c001n03 allocation score on c001n03: 100
-native_color: rsc_c001n03 allocation score on c001n01: 0
+clone_color: promoteme allocation score on c001n08: 0
+clone_color: promoteme allocation score on c001n02: 0
+clone_color: promoteme allocation score on c001n03: 100
+clone_color: promoteme allocation score on c001n01: 0
+clone_color: rsc_c001n03:0 allocation score on c001n08: 0
+clone_color: rsc_c001n03:0 allocation score on c001n02: 0
+clone_color: rsc_c001n03:0 allocation score on c001n03: 101
+clone_color: rsc_c001n03:0 allocation score on c001n01: 0
+native_color: rsc_c001n03:0 allocation score on c001n08: 0
+native_color: rsc_c001n03:0 allocation score on c001n02: 0
+native_color: rsc_c001n03:0 allocation score on c001n03: 101
+native_color: rsc_c001n03:0 allocation score on c001n01: 0
+rsc_c001n03:0 promotion score on c001n03: 1000000
+rsc_c001n03:1 promotion score on none: 0
 native_color: rsc_c001n01 allocation score on c001n08: 0
 native_color: rsc_c001n01 allocation score on c001n02: 0
 native_color: rsc_c001n01 allocation score on c001n03: 0
 native_color: rsc_c001n01 allocation score on c001n01: 100