@nanobpm/nano-workforce 0.145.0 → 0.145.1

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [0.145.1](https://github.com/nanobpm/nano-workforce/compare/v0.145.0...v0.145.1) (2026-08-26)
+
+### Bug Fixes
+
+* bound the merge-loop wait-landed wait so a never-enqueued PR escalates ([#556](https://github.com/nanobpm/nano-workforce/issues/556)) ([#558](https://github.com/nanobpm/nano-workforce/issues/558)) ([0e14578](https://github.com/nanobpm/nano-workforce/commit/0e14578e23d3914f8ae82a9fd84280fbc05c6588))
+
 ## [0.145.0](https://github.com/nanobpm/nano-workforce/compare/v0.144.0...v0.145.0) (2026-08-25)
 
 ### Features

package/app/contracts.ts

@@ -136,6 +136,13 @@ export const ENV_CONTRACTS = {
     owner: "app/service.ts",
     semantics: "Minutes between review nudges.",
   },
+  NANO_PR_MERGE_LANDED_WAIT_TIMEOUT: {
+    category: "env",
+    name: "NANO_PR_MERGE_LANDED_WAIT_TIMEOUT",
+    owner: "app/service.ts",
+    semantics:
+      "How long the merge loop waits for a queued PR to actually land before escalating (FEEL/ISO-8601 duration).",
+  },
   NANO_PR_AUTO_MERGE: {
     category: "env",
     name: "NANO_PR_AUTO_MERGE",

package/app/mergeLandedWait.test.ts

@@ -0,0 +1,39 @@
+// Unit coverage for the merge-queue landing liveness timeout policy. The value is baked into every
+// merge-loop instance's `landedWaitTimeout` process variable and evaluated by the `wait-landed-timeout`
+// timer catch (the timer arm of the `eg-landed` event-based gateway), so a malformed operator env
+// must never deploy an uninterpretable `<bpmn:timeDuration>` — it falls back to the default instead.
+// Run with `node --test`.
+
+import assert from "node:assert/strict";
+import { test } from "node:test";
+import { DEFAULT_MERGE_LANDED_WAIT_TIMEOUT, mergeLandedWaitTimeout } from "./mergeLandedWait.ts";
+
+test("mergeLandedWaitTimeout: blank / absent / malformed → default", () => {
+  assert.equal(mergeLandedWaitTimeout(undefined), DEFAULT_MERGE_LANDED_WAIT_TIMEOUT);
+  assert.equal(mergeLandedWaitTimeout(""), DEFAULT_MERGE_LANDED_WAIT_TIMEOUT);
+  assert.equal(mergeLandedWaitTimeout("   "), DEFAULT_MERGE_LANDED_WAIT_TIMEOUT);
+  assert.equal(mergeLandedWaitTimeout("1h"), DEFAULT_MERGE_LANDED_WAIT_TIMEOUT); // missing leading P/T
+  assert.equal(mergeLandedWaitTimeout("P"), DEFAULT_MERGE_LANDED_WAIT_TIMEOUT); // no component
+  assert.equal(mergeLandedWaitTimeout("PT"), DEFAULT_MERGE_LANDED_WAIT_TIMEOUT); // T with no time part
+  assert.equal(mergeLandedWaitTimeout("garbage"), DEFAULT_MERGE_LANDED_WAIT_TIMEOUT);
+});
+
+test("mergeLandedWaitTimeout: a valid ISO-8601 duration is honoured and upper-cased", () => {
+  assert.equal(mergeLandedWaitTimeout("PT30M"), "PT30M");
+  assert.equal(mergeLandedWaitTimeout("pt2h"), "PT2H");
+  assert.equal(mergeLandedWaitTimeout("P1D"), "P1D");
+  assert.equal(mergeLandedWaitTimeout("  pt90m  "), "PT90M");
+});
+
+test("mergeLandedWaitTimeout: an explicit fallback is honoured for a bad value", () => {
+  assert.equal(mergeLandedWaitTimeout("nope", "PT10M"), "PT10M");
+  assert.equal(mergeLandedWaitTimeout("PT45M", "PT10M"), "PT45M");
+});
+
+test("the default is itself a well-formed ISO-8601 duration (never an uninterpretable timer)", () => {
+  // Validate the default against the grammar with a *distinct* fallback: if the default were
+  // malformed it would fall through to the sentinel, so equality to itself proves it parses.
+  const sentinel = "PT1S";
+  assert.notEqual(DEFAULT_MERGE_LANDED_WAIT_TIMEOUT, sentinel);
+  assert.equal(mergeLandedWaitTimeout(DEFAULT_MERGE_LANDED_WAIT_TIMEOUT, sentinel), DEFAULT_MERGE_LANDED_WAIT_TIMEOUT);
+});

package/app/mergeLandedWait.ts

@@ -0,0 +1,39 @@
+// Merge-queue landing liveness policy — kept as a pure module (no env, no I/O) so it is trivially
+// testable, mirroring app/agentSla.ts. `app/service.ts` seeds the validated `landedWaitTimeout`
+// process variable when it starts the merge-loop; the merge-loop's `wait-landed-timeout` timer catch
+// (the timer arm of the `eg-landed` event-based gateway, racing `merge-landed` / `merge-evicted`)
+// evaluates its `<bpmn:timeDuration>=landedWaitTimeout` at timer creation (FEEL-expression timer
+// durations, engine-native).
+//
+// This closes the merge-queue landing liveness gap (issue #556): `attempt-merge` classifies a merge
+// as `queued` on an ambiguous "merge queue" signal (or a REST "accepted but not yet landed"
+// fallback) WITHOUT verifying the PR was actually enqueued. On a repo where a plain `gh pr merge`
+// does not enqueue (e.g. Mergify, which needs an explicit `@Mergifyio queue`), the PR is never
+// placed in any queue, yet the loop parks at `wait-landed` awaiting a `merge-landed` that can never
+// be published — ACTIVE, no incident, no escalation, forever. Bounding the wait with a timer arm
+// makes that impossible: when the timeout elapses the token routes to the existing merge escalation
+// so a human is pulled in (add it to the queue / merge it, then reply to retry). It is a durable,
+// in-process backstop — no external watchdog required, mirroring the convergence loop's
+// `wait-review-timeout`.
+
+import { isoDuration } from "./reviewWait.ts";
+
+/** Default merge-queue landing timeout (ISO-8601 duration): how long the merge loop waits for a
+ * `queued` PR to actually land before the timer arm of the `eg-landed` event-based gateway fires and
+ * it escalates to a human. Deliberately generous — a native GitHub merge queue legitimately takes a
+ * while to build the prospective merged commit and run its required checks — while still bounded so a
+ * never-enqueued PR (the Mergify-eligible-but-unqueued wedge, #556) surfaces to a human rather than
+ * hanging forever. */
+export const DEFAULT_MERGE_LANDED_WAIT_TIMEOUT = "PT1H";
+
+/** Validate the operator-supplied merge-queue landing timeout (env
+ * `NANO_PR_MERGE_LANDED_WAIT_TIMEOUT`, ISO-8601 duration), falling back to
+ * {@link DEFAULT_MERGE_LANDED_WAIT_TIMEOUT} when absent, blank, or malformed — a bad env value must
+ * never deploy an uninterpretable timer expression. Derives its validation from the single canonical
+ * {@link isoDuration}. */
+export function mergeLandedWaitTimeout(
+  raw: string | undefined,
+  def: string = DEFAULT_MERGE_LANDED_WAIT_TIMEOUT,
+): string {
+  return isoDuration(raw, def);
+}

package/app/mergeLoopBehaviour.test.ts

@@ -41,6 +41,7 @@ import {
 const MODEL = readFileSync("resources/processes/merge-loop.bpmn", "utf8");
 
 const AGENT_SLA_MS = 30 * 60 * 1000; // matches the PT30M we start instances with
+const LANDED_WAIT_MS = 30 * 60 * 1000; // matches the PT30M landedWaitTimeout we start instances with
 
 type Output = Record<string, unknown>;
 type Responder = Output | Output[] | ((job: { variables: Record<string, unknown> }) => Output);
@@ -80,6 +81,7 @@ const DEFAULT_VARS: Record<string, unknown> = {
   rebaseRound: 0,
   mergeRetryRound: 0,
   agentSlaTimeout: "PT30M",
+  landedWaitTimeout: "PT30M",
   abandonBrief: null,
   failingChecksList: null,
   status: null,
@@ -206,11 +208,36 @@ test("a queued merge parks on the event gateway; the landed message marks it mer
   const engine = await boot({ responses: { "pr.merge": { mergeStatus: "queued" } } });
   await engine.publishMessage({ name: "deps-cleared", correlationKey: "pr-1" });
   await engine.publishMessage({ name: "merge-ready", correlationKey: "pr-1", variables: { mergeState: "ready" } });
-  assertThatInstance(engine, byProcessId("merge-loop")).isActive().hasActiveElements("wait-landed", "wait-evicted");
+  assertThatInstance(engine, byProcessId("merge-loop")).isActive().hasActiveElements("wait-landed", "wait-evicted", "wait-landed-timeout");
   await engine.publishMessage({ name: "merge-landed", correlationKey: "pr-1" });
   assertThatInstance(engine, byProcessId("merge-loop")).hasCompleted().hasCompletedElements("mark-merged");
 });
 
+test("a queued merge that never lands escalates when the landing timeout fires (#556)", async () => {
+  // The Mergify wedge: `attempt-merge` classifies the merge `queued` on an ambiguous signal, but the
+  // repo never actually enqueued the PR, so `merge-landed` can never be published. Without the timer
+  // arm the token would park at `wait-landed` forever (ACTIVE, no incident). The timer bounds it.
+  const engine = await boot({ responses: { "pr.merge": { mergeStatus: "queued" } } });
+  await engine.publishMessage({ name: "deps-cleared", correlationKey: "pr-1" });
+  await engine.publishMessage({ name: "merge-ready", correlationKey: "pr-1", variables: { mergeState: "ready" } });
+  assertThatInstance(engine, byProcessId("merge-loop")).isActive().hasActiveElement("wait-landed");
+  await engine.advanceTime(LANDED_WAIT_MS + 1);
+  await assertThatUserTask(engine, { instance: byProcessId("merge-loop"), elementId: "wait-merge-answer" }).isCreated();
+  assertThatInstance(engine, byProcessId("merge-loop")).hasCompletedElements("merge-esc-landed");
+  assert(!completedElementIds(engine).has("mark-merged"), "a never-landed queued merge must not mark-merged");
+  assertStringIncludes(String(escalation(engine).question ?? ""), "did not land within the merge-queue landing timeout", "the escalation must name the landing-timeout trigger");
+});
+
+test("answering the landing-timeout escalation re-arms the merge poller (#556)", async () => {
+  const engine = await boot({ responses: { "pr.merge": { mergeStatus: "queued" } } });
+  await engine.publishMessage({ name: "deps-cleared", correlationKey: "pr-1" });
+  await engine.publishMessage({ name: "merge-ready", correlationKey: "pr-1", variables: { mergeState: "ready" } });
+  await engine.advanceTime(LANDED_WAIT_MS + 1);
+  await assertThatUserTask(engine, { instance: byProcessId("merge-loop"), elementId: "wait-merge-answer" }).isCreated();
+  await engine.completeUserTask(await mergeAnswerTaskKey(engine), { answer: "queued it manually, retry" });
+  assertThatInstance(engine, byProcessId("merge-loop")).isActive().hasActiveElement("wait-mergeable");
+});
+
 test("an evicted queued merge re-arms the poller rather than completing", async () => {
   const engine = await boot({ responses: { "pr.merge": { mergeStatus: "queued" } } });
   await engine.publishMessage({ name: "deps-cleared", correlationKey: "pr-1" });

package/app/service.ts

@@ -54,6 +54,7 @@ import {
 import { activeStatusesFor, derivedTrackingTable } from "./instanceTracking.ts";
 import { pollLineage } from "./lineage.ts";
 import { mergeLanes, readExclusions } from "./mergeExclusion.ts";
+import { mergeLandedWaitTimeout } from "./mergeLandedWait.ts";
 import {
   freshHeadRunAction,
   headRunPresenceCount,
@@ -156,6 +157,18 @@ export const AGENT_SLA_TIMEOUT = agentSlaTimeout(process.env.NANO_PR_AGENT_SLA_T
  * default so an uninterpretable timer is never deployed. */
 export const REVIEW_WAIT_TIMEOUT = reviewWaitTimeout(process.env.NANO_PR_REVIEW_WAIT_TIMEOUT);
 
+/** How long the merge loop waits for a `queued` PR to actually land before escalating to a human.
+ * Seeded as the `landedWaitTimeout` process variable at merge start and evaluated by the merge-loop's
+ * `wait-landed-timeout` timer catch (the timer arm of the `eg-landed` event-based gateway, racing the
+ * `merge-landed` / `merge-evicted` messages). `attempt-merge` classifies a merge as `queued` on an
+ * ambiguous "merge queue" signal without verifying a real enqueue, so on a repo that never actually
+ * queues a plain `gh pr merge` (e.g. Mergify) the loop would otherwise park at `wait-landed` forever
+ * (issue #556). ISO-8601 duration; a malformed `NANO_PR_MERGE_LANDED_WAIT_TIMEOUT` falls back to the
+ * default so an uninterpretable timer is never deployed. */
+export const MERGE_LANDED_WAIT_TIMEOUT = mergeLandedWaitTimeout(
+  process.env.NANO_PR_MERGE_LANDED_WAIT_TIMEOUT,
+);
+
 /** Cooldown (ms) between the poller's automatic Copilot re-request nudges for a single waiting PR.
  * Copilot dismisses re-requests, so the poller retries — but not on every tick; this throttles it
  * to one attempt per window. Set via `NANO_PR_REVIEW_NUDGE_MINUTES` (minutes). */
@@ -708,6 +721,7 @@ export async function startMerge(
       mergeRetryRound: 0,
       mergeRetryMax: MAX_MERGE_RETRIES,
       agentSlaTimeout: AGENT_SLA_TIMEOUT,
+      landedWaitTimeout: MERGE_LANDED_WAIT_TIMEOUT,
       // Lineage (issue #245): thread the origin identity onto the merge instance (see startMerge).
       rootRequestKey,
       abandonUrl: abUrl,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nanobpm/nano-workforce",
-  "version": "0.145.0",
+  "version": "0.145.1",
   "description": "Nano Workforce — an Agent Graph Orchestration application for Agentic SDLC: durable BPMN processes that coordinate a graph of AI agents across the software delivery lifecycle.",
   "type": "module",
   "main": "main.ts",

package/resources/processes/merge-loop.bpmn

@@ -155,6 +155,7 @@
       <bpmn:incoming>f_m_gQueued</bpmn:incoming>
       <bpmn:outgoing>f_eg_landed</bpmn:outgoing>
       <bpmn:outgoing>f_eg_evicted</bpmn:outgoing>
+      <bpmn:outgoing>f_eg_landedTimeout</bpmn:outgoing>
     </bpmn:eventBasedGateway>
     <bpmn:intermediateCatchEvent id="wait-landed" name="Wait: merge queue landed">
       <bpmn:incoming>f_eg_landed</bpmn:incoming>
@@ -166,6 +167,13 @@
       <bpmn:outgoing>f_m_evicted</bpmn:outgoing>
       <bpmn:messageEventDefinition id="med_mergeEvicted" messageRef="Message_mergeEvicted" />
     </bpmn:intermediateCatchEvent>
+    <bpmn:intermediateCatchEvent id="wait-landed-timeout" name="Wait: merge-queue landing timeout">
+      <bpmn:incoming>f_eg_landedTimeout</bpmn:incoming>
+      <bpmn:outgoing>f_m_landedStalled</bpmn:outgoing>
+      <bpmn:timerEventDefinition id="ted_landedTimeout">
+        <bpmn:timeDuration xsi:type="bpmn:tFormalExpression">=landedWaitTimeout</bpmn:timeDuration>
+      </bpmn:timerEventDefinition>
+    </bpmn:intermediateCatchEvent>
     <bpmn:serviceTask id="mark-merged" name="Mark merged">
       <bpmn:extensionElements>
         <zeebe:taskDefinition type="pr.mark-merged" />
@@ -223,9 +231,25 @@
     </bpmn:serviceTask>
     <bpmn:exclusiveGateway id="gw-merge-escalated" name="escalation opened?" default="f_m_escReenter">
       <bpmn:incoming>f_m_escA</bpmn:incoming>
+      <bpmn:incoming>f_m_escLanded</bpmn:incoming>
       <bpmn:outgoing>f_m_escWait</bpmn:outgoing>
       <bpmn:outgoing>f_m_escReenter</bpmn:outgoing>
     </bpmn:exclusiveGateway>
+    <bpmn:serviceTask id="merge-esc-landed" name="Escalate: merge queue never landed">
+      <bpmn:extensionElements>
+        <zeebe:taskDefinition type="pr.persist-escalation" />
+        <zeebe:properties>
+          <zeebe:property name="io.nanobpm.dataEnvelope.in" value="EscalationIn" />
+          <zeebe:property name="io.nanobpm.dataEnvelope.out" value="EscalationOut" />
+        </zeebe:properties>
+        <zeebe:ioMapping>
+          <zeebe:input source="=&#34;blocked&#34;" target="status" />
+          <zeebe:input source="=&#34;This PR was reported as added to the merge queue but did not land within the merge-queue landing timeout (&#34; + landedWaitTimeout + &#34;). The repository may not have actually enqueued it — e.g. a Mergify repo where a plain merge does not queue and an explicit `@Mergifyio queue` is required, or a native merge queue that dropped it silently. Add the PR to the merge queue (or merge it) manually, then reply to retry.&#34;" target="question" />
+        </zeebe:ioMapping>
+      </bpmn:extensionElements>
+      <bpmn:incoming>f_m_landedStalled</bpmn:incoming>
+      <bpmn:outgoing>f_m_escLanded</bpmn:outgoing>
+    </bpmn:serviceTask>
     <bpmn:userTask id="wait-merge-answer" name="Answer escalation">
       <bpmn:extensionElements>
         <zeebe:formDefinition formId="pr-escalation" />
@@ -575,6 +599,9 @@
     <bpmn:sequenceFlow id="f_mr_giveup" name="budget exhausted" sourceRef="gw-merge-retry" targetRef="merge-esc-attempt" />
     <bpmn:sequenceFlow id="f_eg_landed" sourceRef="eg-landed" targetRef="wait-landed" />
     <bpmn:sequenceFlow id="f_eg_evicted" sourceRef="eg-landed" targetRef="wait-evicted" />
+    <bpmn:sequenceFlow id="f_eg_landedTimeout" sourceRef="eg-landed" targetRef="wait-landed-timeout" />
+    <bpmn:sequenceFlow id="f_m_landedStalled" sourceRef="wait-landed-timeout" targetRef="merge-esc-landed" />
+    <bpmn:sequenceFlow id="f_m_escLanded" sourceRef="merge-esc-landed" targetRef="gw-merge-escalated" />
     <bpmn:sequenceFlow id="f_m_evicted" sourceRef="wait-evicted" targetRef="arm-merge" />
     <bpmn:sequenceFlow id="f_m_gBlocked" name="blocked" sourceRef="gw-merge" targetRef="merge-esc-attempt" />
     <bpmn:sequenceFlow id="f_m_gAbandoned" name="abandoned (PR closed)" sourceRef="gw-merge" targetRef="MergeAbandoned">
@@ -594,428 +621,469 @@
   <bpmndi:BPMNDiagram id="BPMNDiagram_merge-loop">
     <bpmndi:BPMNPlane id="BPMNPlane_merge-loop" bpmnElement="merge-loop">
       <bpmndi:BPMNShape id="BPMNShape_MergeStart" bpmnElement="MergeStart">
-        <dc:Bounds x="80" y="102" width="36" height="36" />
+        <dc:Bounds x="80" y="262" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="54" y="143" width="89" height="14" />
+          <dc:Bounds x="54" y="303" width="89" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_wait-deps" bpmnElement="wait-deps">
-        <dc:Bounds x="216" y="102" width="36" height="36" />
+        <dc:Bounds x="216" y="262" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="190" y="55" width="88" height="42" />
+          <dc:Bounds x="190" y="215" width="88" height="42" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_arm-merge" bpmnElement="arm-merge">
-        <dc:Bounds x="352" y="80" width="100" height="80" />
+        <dc:Bounds x="352" y="240" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_wait-mergeable" bpmnElement="wait-mergeable">
-        <dc:Bounds x="552" y="102" width="36" height="36" />
+        <dc:Bounds x="552" y="262" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="535" y="69" width="70" height="28" />
+          <dc:Bounds x="535" y="229" width="70" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-mergeable" bpmnElement="gw-mergeable" isMarkerVisible="true">
-        <dc:Bounds x="688" y="95" width="50" height="50" />
+        <dc:Bounds x="688" y="255" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="675" y="76" width="77" height="14" />
+          <dc:Bounds x="675" y="236" width="77" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_attempt-merge" bpmnElement="attempt-merge">
-        <dc:Bounds x="838" y="80" width="100" height="80" />
+        <dc:Bounds x="838" y="240" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-merge" bpmnElement="gw-merge" isMarkerVisible="true">
-        <dc:Bounds x="1063" y="95" width="50" height="50" />
+        <dc:Bounds x="1063" y="255" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1022" y="150" width="53" height="28" />
+          <dc:Bounds x="1062" y="222" width="53" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-merge-retry" bpmnElement="gw-merge-retry" isMarkerVisible="true">
-        <dc:Bounds x="1238" y="575" width="50" height="50" />
+        <dc:Bounds x="1238" y="735" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1219" y="670" width="88" height="28" />
+          <dc:Bounds x="1259" y="810" width="88" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_eg-landed" bpmnElement="eg-landed" isMarkerVisible="true">
-        <dc:Bounds x="1238" y="255" width="50" height="50" />
+        <dc:Bounds x="1238" y="415" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1231" y="222" width="64" height="28" />
+          <dc:Bounds x="1231" y="490" width="64" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_wait-landed" bpmnElement="wait-landed">
-        <dc:Bounds x="1420" y="262" width="36" height="36" />
+        <dc:Bounds x="1420" y="422" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1396" y="303" width="85" height="28" />
+          <dc:Bounds x="1416" y="483" width="85" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_wait-evicted" bpmnElement="wait-evicted">
-        <dc:Bounds x="1420" y="422" width="36" height="36" />
+        <dc:Bounds x="1420" y="582" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1461" y="579" width="88" height="42" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_wait-landed-timeout" bpmnElement="wait-landed-timeout">
+        <dc:Bounds x="1420" y="102" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1394" y="375" width="88" height="42" />
+          <dc:Bounds x="1331" y="92" width="84" height="56" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_mark-merged" bpmnElement="mark-merged">
-        <dc:Bounds x="1588" y="80" width="100" height="80" />
+        <dc:Bounds x="1588" y="240" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_MergeEnd" bpmnElement="MergeEnd">
-        <dc:Bounds x="1820" y="102" width="36" height="36" />
+        <dc:Bounds x="1795" y="262" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1813" y="143" width="50" height="14" />
+          <dc:Bounds x="1788" y="303" width="50" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_MergeAbandoned" bpmnElement="MergeAbandoned">
-        <dc:Bounds x="1245" y="742" width="36" height="36" />
+        <dc:Bounds x="1245" y="902" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1222" y="783" width="82" height="28" />
+          <dc:Bounds x="1222" y="943" width="82" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_merge-esc-conflict" bpmnElement="merge-esc-conflict">
-        <dc:Bounds x="1388" y="880" width="100" height="80" />
+        <dc:Bounds x="1388" y="1040" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_merge-esc-attempt" bpmnElement="merge-esc-attempt">
-        <dc:Bounds x="1388" y="560" width="100" height="80" />
+        <dc:Bounds x="1388" y="720" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-merge-escalated" bpmnElement="gw-merge-escalated" isMarkerVisible="true">
-        <dc:Bounds x="1613" y="575" width="50" height="50" />
+        <dc:Bounds x="1788" y="95" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1601" y="670" width="74" height="28" />
+          <dc:Bounds x="1756" y="150" width="74" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_merge-esc-landed" bpmnElement="merge-esc-landed">
+        <dc:Bounds x="1588" y="80" width="100" height="80" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_wait-merge-answer" bpmnElement="wait-merge-answer">
-        <dc:Bounds x="1788" y="560" width="100" height="80" />
+        <dc:Bounds x="1938" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_record-merge-answer" bpmnElement="record-merge-answer">
-        <dc:Bounds x="1988" y="560" width="100" height="80" />
+        <dc:Bounds x="2138" y="80" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-ci-fix" bpmnElement="gw-ci-fix" isMarkerVisible="true">
-        <dc:Bounds x="863" y="895" width="50" height="50" />
+        <dc:Bounds x="863" y="1055" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="784" y="950" width="89" height="14" />
+          <dc:Bounds x="904" y="1110" width="89" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_SP_cifix" bpmnElement="SP_cifix">
-        <dc:Bounds x="1038" y="1040" width="100" height="80" />
+        <dc:Bounds x="1038" y="1200" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-ci-outcome" bpmnElement="gw-ci-outcome" isMarkerVisible="true">
-        <dc:Bounds x="1238" y="1055" width="50" height="50" />
+        <dc:Bounds x="1238" y="1215" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1232" y="1150" width="63" height="28" />
+          <dc:Bounds x="1232" y="1310" width="63" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-rebase" bpmnElement="gw-rebase" isMarkerVisible="true">
-        <dc:Bounds x="863" y="255" width="50" height="50" />
+        <dc:Bounds x="863" y="415" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="844" y="236" width="88" height="14" />
+          <dc:Bounds x="844" y="370" width="88" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_SP_rebase" bpmnElement="SP_rebase">
-        <dc:Bounds x="1038" y="1200" width="100" height="80" />
+        <dc:Bounds x="1038" y="1360" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_gw-rebase-outcome" bpmnElement="gw-rebase-outcome" isMarkerVisible="true">
-        <dc:Bounds x="1238" y="1215" width="50" height="50" />
+        <dc:Bounds x="1238" y="1375" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1232" y="1310" width="63" height="28" />
+          <dc:Bounds x="1272" y="1430" width="63" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_record-merge-dep" bpmnElement="record-merge-dep">
-        <dc:Bounds x="1388" y="1040" width="100" height="80" />
+        <dc:Bounds x="1388" y="1200" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_start" bpmnElement="f_m_start">
-        <di:waypoint x="116" y="120" />
-        <di:waypoint x="216" y="120" />
+        <di:waypoint x="116" y="280" />
+        <di:waypoint x="216" y="280" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_deps" bpmnElement="f_m_deps">
-        <di:waypoint x="252" y="120" />
-        <di:waypoint x="352" y="120" />
+        <di:waypoint x="252" y="280" />
+        <di:waypoint x="352" y="280" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_arm" bpmnElement="f_m_arm">
-        <di:waypoint x="452" y="120" />
-        <di:waypoint x="552" y="120" />
+        <di:waypoint x="452" y="280" />
+        <di:waypoint x="552" y="280" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_ready" bpmnElement="f_m_ready">
-        <di:waypoint x="588" y="120" />
-        <di:waypoint x="688" y="120" />
+        <di:waypoint x="588" y="280" />
+        <di:waypoint x="688" y="280" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_mReady" bpmnElement="f_m_mReady">
-        <di:waypoint x="738" y="120" />
-        <di:waypoint x="838" y="120" />
+        <di:waypoint x="738" y="280" />
+        <di:waypoint x="838" y="280" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="769" y="98" width="39" height="14" />
+          <dc:Bounds x="769" y="258" width="39" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_attempt" bpmnElement="f_m_attempt">
-        <di:waypoint x="938" y="120" />
-        <di:waypoint x="1063" y="120" />
+        <di:waypoint x="938" y="280" />
+        <di:waypoint x="1063" y="280" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_gMerged" bpmnElement="f_m_gMerged">
-        <di:waypoint x="1113" y="120" />
-        <di:waypoint x="1588" y="120" />
+        <di:waypoint x="1113" y="280" />
+        <di:waypoint x="1588" y="280" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1379" y="98" width="49" height="14" />
+          <dc:Bounds x="1401" y="258" width="49" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_done" bpmnElement="f_m_done">
-        <di:waypoint x="1688" y="120" />
-        <di:waypoint x="1820" y="120" />
+        <di:waypoint x="1688" y="280" />
+        <di:waypoint x="1795" y="280" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_ci_rearm" bpmnElement="f_ci_rearm">
-        <di:waypoint x="1263" y="1105" />
-        <di:waypoint x="1263" y="1140" />
-        <di:waypoint x="402" y="1140" />
-        <di:waypoint x="402" y="160" />
+        <di:waypoint x="1263" y="1265" />
+        <di:waypoint x="1263" y="1300" />
+        <di:waypoint x="402" y="1300" />
+        <di:waypoint x="402" y="320" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="789" y="1079" width="88" height="56" />
+          <dc:Bounds x="442" y="1239" width="88" height="56" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reb_rearm" bpmnElement="f_reb_rearm">
-        <di:waypoint x="1263" y="1265" />
-        <di:waypoint x="1263" y="1300" />
-        <di:waypoint x="402" y="1300" />
-        <di:waypoint x="402" y="160" />
+        <di:waypoint x="1263" y="1425" />
+        <di:waypoint x="1263" y="1460" />
+        <di:waypoint x="402" y="1460" />
+        <di:waypoint x="402" y="320" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="794" y="1253" width="78" height="42" />
+          <dc:Bounds x="794" y="1413" width="78" height="42" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_ci_giveup" bpmnElement="f_ci_giveup">
-        <di:waypoint x="913" y="920" />
-        <di:waypoint x="1388" y="920" />
+        <di:waypoint x="913" y="1080" />
+        <di:waypoint x="1388" y="1080" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1127" y="925" width="67" height="28" />
+          <dc:Bounds x="1127" y="1085" width="67" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reb_giveup" bpmnElement="f_reb_giveup">
-        <di:waypoint x="913" y="280" />
-        <di:waypoint x="933" y="280" />
-        <di:waypoint x="933" y="305" />
-        <di:waypoint x="1163" y="305" />
-        <di:waypoint x="1163" y="900" />
-        <di:waypoint x="1388" y="900" />
+        <di:waypoint x="913" y="440" />
+        <di:waypoint x="933" y="440" />
+        <di:waypoint x="933" y="465" />
+        <di:waypoint x="1163" y="465" />
+        <di:waypoint x="1163" y="1060" />
+        <di:waypoint x="1388" y="1060" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1035" y="310" width="67" height="28" />
+          <dc:Bounds x="1035" y="432" width="67" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_mr_giveup" bpmnElement="f_mr_giveup">
-        <di:waypoint x="1288" y="600" />
-        <di:waypoint x="1388" y="600" />
+        <di:waypoint x="1288" y="760" />
+        <di:waypoint x="1388" y="760" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1305" y="605" width="67" height="28" />
+          <dc:Bounds x="1285" y="687" width="67" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_eg_landed" bpmnElement="f_eg_landed">
-        <di:waypoint x="1288" y="280" />
-        <di:waypoint x="1420" y="280" />
+        <di:waypoint x="1288" y="440" />
+        <di:waypoint x="1420" y="440" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_landed" bpmnElement="f_m_landed">
-        <di:waypoint x="1456" y="280" />
-        <di:waypoint x="1638" y="280" />
-        <di:waypoint x="1638" y="160" />
+        <di:waypoint x="1456" y="440" />
+        <di:waypoint x="1638" y="440" />
+        <di:waypoint x="1638" y="320" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_escC" bpmnElement="f_m_escC">
-        <di:waypoint x="1488" y="920" />
-        <di:waypoint x="1838" y="920" />
-        <di:waypoint x="1838" y="640" />
+        <di:waypoint x="1488" y="1080" />
+        <di:waypoint x="1988" y="1080" />
+        <di:waypoint x="1988" y="160" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_escA" bpmnElement="f_m_escA">
-        <di:waypoint x="1488" y="600" />
-        <di:waypoint x="1613" y="600" />
+        <di:waypoint x="1488" y="760" />
+        <di:waypoint x="1851" y="760" />
+        <di:waypoint x="1851" y="145" />
+        <di:waypoint x="1858" y="145" />
+        <di:waypoint x="1858" y="120" />
+        <di:waypoint x="1838" y="120" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_escReenter" bpmnElement="f_m_escReenter">
-        <di:waypoint x="1638" y="625" />
-        <di:waypoint x="1638" y="660" />
-        <di:waypoint x="402" y="660" />
-        <di:waypoint x="402" y="160" />
+        <di:waypoint x="1813" y="95" />
+        <di:waypoint x="1813" y="60" />
+        <di:waypoint x="402" y="60" />
+        <di:waypoint x="402" y="240" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1023" y="665" width="74" height="42" />
+          <dc:Bounds x="1071" y="13" width="74" height="42" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_answerRecord" bpmnElement="f_m_answerRecord">
-        <di:waypoint x="1888" y="600" />
-        <di:waypoint x="1988" y="600" />
+        <di:waypoint x="2038" y="120" />
+        <di:waypoint x="2138" y="120" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_answer" bpmnElement="f_m_answer">
-        <di:waypoint x="2038" y="640" />
-        <di:waypoint x="2038" y="980" />
-        <di:waypoint x="402" y="980" />
-        <di:waypoint x="402" y="160" />
+        <di:waypoint x="2188" y="160" />
+        <di:waypoint x="2188" y="340" />
+        <di:waypoint x="402" y="340" />
+        <di:waypoint x="402" y="320" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_ci_escAttempt" bpmnElement="f_ci_escAttempt">
-        <di:waypoint x="1263" y="1055" />
-        <di:waypoint x="1263" y="1035" />
-        <di:waypoint x="1908" y="1035" />
-        <di:waypoint x="1908" y="555" />
-        <di:waypoint x="1368" y="555" />
-        <di:waypoint x="1368" y="580" />
-        <di:waypoint x="1388" y="580" />
+        <di:waypoint x="1263" y="1215" />
+        <di:waypoint x="1263" y="1195" />
+        <di:waypoint x="843" y="1195" />
+        <di:waypoint x="843" y="402" />
+        <di:waypoint x="1218" y="402" />
+        <di:waypoint x="1218" y="478" />
+        <di:waypoint x="1368" y="478" />
+        <di:waypoint x="1368" y="740" />
+        <di:waypoint x="1388" y="740" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1556" y="1013" width="60" height="14" />
+          <dc:Bounds x="1023" y="1173" width="60" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reb_waitDep" bpmnElement="f_reb_waitDep">
-        <di:waypoint x="1288" y="1240" />
-        <di:waypoint x="1438" y="1240" />
-        <di:waypoint x="1438" y="1120" />
+        <di:waypoint x="1288" y="1400" />
+        <di:waypoint x="1438" y="1400" />
+        <di:waypoint x="1438" y="1280" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1366" y="1245" width="75" height="28" />
+          <dc:Bounds x="1346" y="1405" width="75" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reb_escAttempt" bpmnElement="f_reb_escAttempt">
-        <di:waypoint x="1288" y="1240" />
-        <di:waypoint x="1308" y="1240" />
-        <di:waypoint x="1308" y="1215" />
-        <di:waypoint x="1908" y="1215" />
-        <di:waypoint x="1908" y="555" />
-        <di:waypoint x="1368" y="555" />
-        <di:waypoint x="1368" y="580" />
-        <di:waypoint x="1388" y="580" />
+        <di:waypoint x="1263" y="1375" />
+        <di:waypoint x="1263" y="1355" />
+        <di:waypoint x="843" y="1355" />
+        <di:waypoint x="843" y="402" />
+        <di:waypoint x="1218" y="402" />
+        <di:waypoint x="1218" y="478" />
+        <di:waypoint x="1368" y="478" />
+        <di:waypoint x="1368" y="740" />
+        <di:waypoint x="1388" y="740" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1913" y="1104" width="64" height="42" />
+          <dc:Bounds x="774" y="1234" width="64" height="42" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reb_escConflict" bpmnElement="f_reb_escConflict">
-        <di:waypoint x="1288" y="1240" />
-        <di:waypoint x="1368" y="1240" />
-        <di:waypoint x="1368" y="920" />
-        <di:waypoint x="1388" y="920" />
+        <di:waypoint x="1288" y="1400" />
+        <di:waypoint x="1368" y="1400" />
+        <di:waypoint x="1368" y="1080" />
+        <di:waypoint x="1388" y="1080" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1303" y="1086" width="60" height="28" />
+          <dc:Bounds x="1303" y="1246" width="60" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_mCiFix" bpmnElement="f_m_mCiFix">
-        <di:waypoint x="713" y="145" />
-        <di:waypoint x="713" y="920" />
-        <di:waypoint x="863" y="920" />
+        <di:waypoint x="713" y="305" />
+        <di:waypoint x="713" y="1080" />
+        <di:waypoint x="863" y="1080" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="718" y="598" width="60" height="42" />
+          <dc:Bounds x="718" y="758" width="60" height="42" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_mRebase" bpmnElement="f_m_mRebase">
-        <di:waypoint x="713" y="145" />
-        <di:waypoint x="713" y="280" />
-        <di:waypoint x="863" y="280" />
+        <di:waypoint x="713" y="305" />
+        <di:waypoint x="713" y="440" />
+        <di:waypoint x="863" y="440" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="758" y="258" width="60" height="14" />
+          <dc:Bounds x="758" y="418" width="60" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_mBlocked" bpmnElement="f_m_mBlocked">
-        <di:waypoint x="713" y="145" />
-        <di:waypoint x="713" y="318" />
-        <di:waypoint x="933" y="318" />
-        <di:waypoint x="933" y="920" />
-        <di:waypoint x="1388" y="920" />
+        <di:waypoint x="713" y="305" />
+        <di:waypoint x="713" y="478" />
+        <di:waypoint x="933" y="478" />
+        <di:waypoint x="933" y="1080" />
+        <di:waypoint x="1388" y="1080" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="781" y="326" width="85" height="14" />
+          <dc:Bounds x="741" y="456" width="85" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_ci_go" bpmnElement="f_ci_go">
-        <di:waypoint x="888" y="945" />
-        <di:waypoint x="888" y="1080" />
-        <di:waypoint x="1038" y="1080" />
+        <di:waypoint x="888" y="1105" />
+        <di:waypoint x="888" y="1240" />
+        <di:waypoint x="1038" y="1240" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="893" y="999" width="49" height="28" />
+          <dc:Bounds x="893" y="1159" width="49" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_reb_go" bpmnElement="f_reb_go">
-        <di:waypoint x="913" y="280" />
-        <di:waypoint x="1018" y="280" />
-        <di:waypoint x="1018" y="1240" />
-        <di:waypoint x="1038" y="1240" />
+        <di:waypoint x="913" y="440" />
+        <di:waypoint x="1018" y="440" />
+        <di:waypoint x="1018" y="1400" />
+        <di:waypoint x="1038" y="1400" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1023" y="746" width="49" height="28" />
+          <dc:Bounds x="1023" y="906" width="49" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_gQueued" bpmnElement="f_m_gQueued">
-        <di:waypoint x="1088" y="145" />
-        <di:waypoint x="1088" y="280" />
-        <di:waypoint x="1238" y="280" />
+        <di:waypoint x="1113" y="280" />
+        <di:waypoint x="1263" y="280" />
+        <di:waypoint x="1263" y="415" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1093" y="206" width="46" height="14" />
+          <dc:Bounds x="1268" y="361" width="46" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_gRetry" bpmnElement="f_m_gRetry">
-        <di:waypoint x="1113" y="120" />
-        <di:waypoint x="1218" y="120" />
-        <di:waypoint x="1218" y="600" />
-        <di:waypoint x="1238" y="600" />
+        <di:waypoint x="1113" y="280" />
+        <di:waypoint x="1218" y="280" />
+        <di:waypoint x="1218" y="760" />
+        <di:waypoint x="1238" y="760" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1135" y="246" width="78" height="28" />
+          <dc:Bounds x="1135" y="419" width="78" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_eg_evicted" bpmnElement="f_eg_evicted">
-        <di:waypoint x="1263" y="305" />
-        <di:waypoint x="1263" y="440" />
-        <di:waypoint x="1420" y="440" />
+        <di:waypoint x="1288" y="440" />
+        <di:waypoint x="1400" y="440" />
+        <di:waypoint x="1400" y="600" />
+        <di:waypoint x="1420" y="600" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_eg_landedTimeout" bpmnElement="f_eg_landedTimeout">
+        <di:waypoint x="1288" y="440" />
+        <di:waypoint x="1308" y="440" />
+        <di:waypoint x="1308" y="415" />
+        <di:waypoint x="1420" y="415" />
+        <di:waypoint x="1420" y="478" />
+        <di:waypoint x="1858" y="478" />
+        <di:waypoint x="1858" y="235" />
+        <di:waypoint x="1420" y="235" />
+        <di:waypoint x="1420" y="158" />
+        <di:waypoint x="1438" y="158" />
+        <di:waypoint x="1438" y="138" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_gBlocked" bpmnElement="f_m_gBlocked">
-        <di:waypoint x="1088" y="95" />
-        <di:waypoint x="1088" y="75" />
-        <di:waypoint x="1876" y="75" />
-        <di:waypoint x="1876" y="478" />
-        <di:waypoint x="1368" y="478" />
-        <di:waypoint x="1368" y="580" />
-        <di:waypoint x="1388" y="580" />
+        <di:waypoint x="1113" y="280" />
+        <di:waypoint x="1133" y="280" />
+        <di:waypoint x="1133" y="305" />
+        <di:waypoint x="1218" y="305" />
+        <di:waypoint x="1218" y="805" />
+        <di:waypoint x="1368" y="805" />
+        <di:waypoint x="1368" y="780" />
+        <di:waypoint x="1388" y="780" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1577" y="456" width="53" height="14" />
+          <dc:Bounds x="1309" y="783" width="53" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_gAbandoned" bpmnElement="f_m_gAbandoned">
-        <di:waypoint x="1088" y="95" />
-        <di:waypoint x="1088" y="75" />
-        <di:waypoint x="1876" y="75" />
-        <di:waypoint x="1876" y="478" />
-        <di:waypoint x="1768" y="478" />
-        <di:waypoint x="1768" y="760" />
-        <di:waypoint x="1281" y="760" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1681" y="605" width="82" height="28" />
+        <di:waypoint x="1113" y="280" />
+        <di:waypoint x="1133" y="280" />
+        <di:waypoint x="1133" y="305" />
+        <di:waypoint x="1225" y="305" />
+        <di:waypoint x="1225" y="805" />
+        <di:waypoint x="1245" y="805" />
+        <di:waypoint x="1245" y="882" />
+        <di:waypoint x="1263" y="882" />
+        <di:waypoint x="1263" y="902" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1230" y="541" width="82" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_ci_waitDep" bpmnElement="f_ci_waitDep">
-        <di:waypoint x="1288" y="1080" />
-        <di:waypoint x="1388" y="1080" />
+        <di:waypoint x="1288" y="1240" />
+        <di:waypoint x="1388" y="1240" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1281" y="987" width="75" height="28" />
+          <dc:Bounds x="1281" y="1167" width="75" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_ci_spdone" bpmnElement="f_ci_spdone">
-        <di:waypoint x="1138" y="1080" />
-        <di:waypoint x="1238" y="1080" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="BPMNEdge_f_reb_spdone" bpmnElement="f_reb_spdone">
         <di:waypoint x="1138" y="1240" />
         <di:waypoint x="1238" y="1240" />
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_reb_spdone" bpmnElement="f_reb_spdone">
+        <di:waypoint x="1138" y="1400" />
+        <di:waypoint x="1238" y="1400" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_m_landedStalled" bpmnElement="f_m_landedStalled">
+        <di:waypoint x="1456" y="120" />
+        <di:waypoint x="1588" y="120" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="BPMNEdge_f_m_escLanded" bpmnElement="f_m_escLanded">
+        <di:waypoint x="1688" y="120" />
+        <di:waypoint x="1788" y="120" />
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_escWait" bpmnElement="f_m_escWait">
-        <di:waypoint x="1663" y="600" />
-        <di:waypoint x="1788" y="600" />
+        <di:waypoint x="1838" y="120" />
+        <di:waypoint x="1938" y="120" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_ci_recheck" bpmnElement="f_ci_recheck">
-        <di:waypoint x="1263" y="1105" />
-        <di:waypoint x="1263" y="1140" />
-        <di:waypoint x="570" y="1140" />
-        <di:waypoint x="570" y="138" />
+        <di:waypoint x="1263" y="1265" />
+        <di:waypoint x="1263" y="1300" />
+        <di:waypoint x="570" y="1300" />
+        <di:waypoint x="570" y="298" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="575" y="605" width="85" height="28" />
+          <dc:Bounds x="575" y="765" width="85" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_dep_rewait" bpmnElement="f_dep_rewait">
-        <di:waypoint x="1438" y="1120" />
-        <di:waypoint x="1438" y="1140" />
-        <di:waypoint x="234" y="1140" />
-        <di:waypoint x="234" y="138" />
+        <di:waypoint x="1438" y="1280" />
+        <di:waypoint x="1438" y="1480" />
+        <di:waypoint x="234" y="1480" />
+        <di:waypoint x="234" y="298" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_mr_go" bpmnElement="f_mr_go">
-        <di:waypoint x="1263" y="625" />
-        <di:waypoint x="1263" y="645" />
-        <di:waypoint x="402" y="645" />
-        <di:waypoint x="402" y="160" />
+        <di:waypoint x="1263" y="785" />
+        <di:waypoint x="1263" y="805" />
+        <di:waypoint x="402" y="805" />
+        <di:waypoint x="402" y="320" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="808" y="612" width="49" height="28" />
+          <dc:Bounds x="786" y="810" width="49" height="28" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_f_m_evicted" bpmnElement="f_m_evicted">
-        <di:waypoint x="1438" y="458" />
-        <di:waypoint x="1438" y="478" />
-        <di:waypoint x="402" y="478" />
-        <di:waypoint x="402" y="160" />
+        <di:waypoint x="1438" y="618" />
+        <di:waypoint x="1438" y="638" />
+        <di:waypoint x="402" y="638" />
+        <di:waypoint x="402" y="320" />
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>