diff --git a/zcash-zf-dag.html b/zcash-zf-dag.html
index 49caba31..967c4f54 100644
--- a/zcash-zf-dag.html
+++ b/zcash-zf-dag.html
@@ -68,7 +68,7 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#3050&#45;&gt;ZcashFoundation/zebra#4967 -->
-<g id="edge5" class="edge">
+<g id="edge6" class="edge">
 <title>ZcashFoundation/zebra#3050&#45;&gt;ZcashFoundation/zebra#4967</title>
 <path fill="none" stroke="#000000" d="M788.31,-1377.5C803.15,-1377.5 818.4,-1377.5 833.39,-1377.5"/>
 <polygon fill="#000000" stroke="#000000" points="833.72,-1381.0001 843.72,-1377.5 833.72,-1374.0001 833.72,-1381.0001"/>
@@ -121,7 +121,7 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#4894&#45;&gt;ZcashFoundation/zebra#4350 -->
-<g id="edge6" class="edge">
+<g id="edge7" class="edge">
 <title>ZcashFoundation/zebra#4894&#45;&gt;ZcashFoundation/zebra#4350</title>
 <path fill="none" stroke="#000000" d="M492.62,-1206.7C495.31,-1203.9 497.79,-1200.8 500,-1197.5 559.08,-1109.8 468.59,-333.94 528,-246.5 536.39,-234.15 547.79,-224.25 560.54,-216.31"/>
 <polygon fill="#000000" stroke="#000000" points="562.6318,-219.1443 569.55,-211.12 559.1378,-213.0786 562.6318,-219.1443"/>
@@ -186,7 +186,7 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#4684&#45;&gt;ZcashFoundation/zebra#3117 -->
-<g id="edge7" class="edge">
+<g id="edge8" class="edge">
 <title>ZcashFoundation/zebra#4684&#45;&gt;ZcashFoundation/zebra#3117</title>
 <path fill="none" stroke="#000000" d="M492.51,-962.25C495.23,-959.55 497.74,-956.64 500,-953.5 558.03,-872.82 464.86,-136.25 528,-59.5 533.33,-53.024 539.64,-47.664 546.61,-43.241"/>
 <polygon fill="#000000" stroke="#000000" points="548.7335,-46.0635 555.75,-38.125 545.3144,-39.9552 548.7335,-46.0635"/>
@@ -227,7 +227,7 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#4882&#45;&gt;ZcashFoundation/zebra#4612 -->
-<g id="edge8" class="edge">
+<g id="edge9" class="edge">
 <title>ZcashFoundation/zebra#4882&#45;&gt;ZcashFoundation/zebra#4612</title>
 <path fill="none" stroke="#000000" d="M492.52,-1120.3C495.24,-1117.6 497.75,-1114.6 500,-1111.5 562.35,-1024.6 463.14,-234.52 528,-149.5 533.36,-142.48 539.81,-136.54 546.97,-131.53"/>
 <polygon fill="#000000" stroke="#000000" points="549.0729,-134.3424 555.68,-126.06 545.3501,-128.4144 549.0729,-134.3424"/>
@@ -336,7 +336,7 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#4350&#45;&gt;ZcashFoundation/zebra#3050 -->
-<g id="edge9" class="edge">
+<g id="edge5" class="edge">
 <title>ZcashFoundation/zebra#4350&#45;&gt;ZcashFoundation/zebra#3050</title>
 <path fill="none" stroke="#000000" d="M672,-211C672,-587.57 672,-964.14 672,-1340.7"/>
 <polygon fill="#000000" stroke="#000000" points="668.5001,-1340.7 672,-1350.7 675.5001,-1340.7 668.5001,-1340.7"/>
diff --git a/zcash-zf-dag.svg b/zcash-zf-dag.svg
index 147e78bf..15325474 100644
--- a/zcash-zf-dag.svg
+++ b/zcash-zf-dag.svg
@@ -56,7 +56,7 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#3050&#45;&gt;ZcashFoundation/zebra#4967 -->
-<g id="edge5" class="edge">
+<g id="edge6" class="edge">
 <title>ZcashFoundation/zebra#3050&#45;&gt;ZcashFoundation/zebra#4967</title>
 <path fill="none" stroke="#000000" d="M788.31,-1377.5C803.15,-1377.5 818.4,-1377.5 833.39,-1377.5"/>
 <polygon fill="#000000" stroke="#000000" points="833.72,-1381.0001 843.72,-1377.5 833.72,-1374.0001 833.72,-1381.0001"/>
@@ -109,7 +109,7 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#4894&#45;&gt;ZcashFoundation/zebra#4350 -->
-<g id="edge6" class="edge">
+<g id="edge7" class="edge">
 <title>ZcashFoundation/zebra#4894&#45;&gt;ZcashFoundation/zebra#4350</title>
 <path fill="none" stroke="#000000" d="M492.62,-1206.7C495.31,-1203.9 497.79,-1200.8 500,-1197.5 559.08,-1109.8 468.59,-333.94 528,-246.5 536.39,-234.15 547.79,-224.25 560.54,-216.31"/>
 <polygon fill="#000000" stroke="#000000" points="562.6318,-219.1443 569.55,-211.12 559.1378,-213.0786 562.6318,-219.1443"/>
@@ -174,7 +174,7 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#4684&#45;&gt;ZcashFoundation/zebra#3117 -->
-<g id="edge7" class="edge">
+<g id="edge8" class="edge">
 <title>ZcashFoundation/zebra#4684&#45;&gt;ZcashFoundation/zebra#3117</title>
 <path fill="none" stroke="#000000" d="M492.51,-962.25C495.23,-959.55 497.74,-956.64 500,-953.5 558.03,-872.82 464.86,-136.25 528,-59.5 533.33,-53.024 539.64,-47.664 546.61,-43.241"/>
 <polygon fill="#000000" stroke="#000000" points="548.7335,-46.0635 555.75,-38.125 545.3144,-39.9552 548.7335,-46.0635"/>
@@ -215,7 +215,7 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#4882&#45;&gt;ZcashFoundation/zebra#4612 -->
-<g id="edge8" class="edge">
+<g id="edge9" class="edge">
 <title>ZcashFoundation/zebra#4882&#45;&gt;ZcashFoundation/zebra#4612</title>
 <path fill="none" stroke="#000000" d="M492.52,-1120.3C495.24,-1117.6 497.75,-1114.6 500,-1111.5 562.35,-1024.6 463.14,-234.52 528,-149.5 533.36,-142.48 539.81,-136.54 546.97,-131.53"/>
 <polygon fill="#000000" stroke="#000000" points="549.0729,-134.3424 555.68,-126.06 545.3501,-128.4144 549.0729,-134.3424"/>
@@ -324,7 +324,7 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#4350&#45;&gt;ZcashFoundation/zebra#3050 -->
-<g id="edge9" class="edge">
+<g id="edge5" class="edge">
 <title>ZcashFoundation/zebra#4350&#45;&gt;ZcashFoundation/zebra#3050</title>
 <path fill="none" stroke="#000000" d="M672,-211C672,-587.57 672,-964.14 672,-1340.7"/>
 <polygon fill="#000000" stroke="#000000" points="668.5001,-1340.7 672,-1350.7 675.5001,-1340.7 668.5001,-1340.7"/>
diff --git a/zcash-zf-devops-dag.html b/zcash-zf-devops-dag.html
index f629d5f9..77f6a8b5 100644
--- a/zcash-zf-devops-dag.html
+++ b/zcash-zf-devops-dag.html
@@ -22,31 +22,19 @@
 <g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 585)">
 <polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-585 1088,-585 1088,4 -4,4"/>
 <g id="clust1" class="cluster">
-<title>cluster_1</title>
-<polygon fill="none" stroke="#0000ff" points="796,-305 796,-412 1084,-412 1084,-305 796,-305"/>
-<text text-anchor="middle" x="940" y="-396.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Zebra as a lightwalletd backend</text>
-</g>
-<g id="clust2" class="cluster">
 <title>cluster_0</title>
 <polygon fill="none" stroke="#0000ff" points="528,0 528,-581 776,-581 776,0 528,0"/>
 <text text-anchor="middle" x="652" y="-565.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Zebra Release Candidates</text>
 </g>
-<!-- ZcashFoundation/zebra#4612 -->
-<g id="node1" class="node open">
-<title>ZcashFoundation/zebra#4612</title>
-<g id="a_node1"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/4612" xlink:title="ZcashFoundation/zebra#4612&#10;ci: Wait for lightwalletd&#10;image rebuild if it has&#10;changed" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="1056,-381 824,-381 824,-313 1056,-313 1056,-381"/>
-<text text-anchor="middle" x="940" y="-365.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#4612</text>
-<text text-anchor="middle" x="940" y="-350.8" font-family="Times,serif" font-size="14.00" fill="#000000">ci: Wait for lightwalletd</text>
-<text text-anchor="middle" x="940" y="-335.8" font-family="Times,serif" font-size="14.00" fill="#000000">image rebuild if it has</text>
-<text text-anchor="middle" x="940" y="-320.8" font-family="Times,serif" font-size="14.00" fill="#000000">changed</text>
-</a>
-</g>
+<g id="clust2" class="cluster">
+<title>cluster_1</title>
+<polygon fill="none" stroke="#0000ff" points="796,-305 796,-412 1084,-412 1084,-305 796,-305"/>
+<text text-anchor="middle" x="940" y="-396.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Zebra as a lightwalletd backend</text>
 </g>
 <!-- ZcashFoundation/zebra#1615 -->
-<g id="node2" class="node open">
+<g id="node1" class="node open">
 <title>ZcashFoundation/zebra#1615</title>
-<g id="a_node2"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1615" xlink:title="ZcashFoundation/zebra#1615&#10;Zebra release candidate&#10;binaries should be linked&#10;from ZFND website" target="_blank">
+<g id="a_node1"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1615" xlink:title="ZcashFoundation/zebra#1615&#10;Zebra release candidate&#10;binaries should be linked&#10;from ZFND website" target="_blank">
 <polygon fill="#a7c2aa" stroke="#000000" points="768,-550 536,-550 536,-482 768,-482 768,-550"/>
 <text text-anchor="middle" x="652" y="-534.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1615</text>
 <text text-anchor="middle" x="652" y="-519.8" font-family="Times,serif" font-size="14.00" fill="#000000">Zebra release candidate</text>
@@ -56,9 +44,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#3050 -->
-<g id="node3" class="node open">
+<g id="node2" class="node open">
 <title>ZcashFoundation/zebra#3050</title>
-<g id="a_node3"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/3050" xlink:title="ZcashFoundation/zebra#3050&#10;Tag Zebra 1.0.0&#45;rc.0&#10;stable release candidate" target="_blank">
+<g id="a_node2"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/3050" xlink:title="ZcashFoundation/zebra#3050&#10;Tag Zebra 1.0.0&#45;rc.0&#10;stable release candidate" target="_blank">
 <polygon fill="#a7c2aa" stroke="#000000" points="768,-463.5 536,-463.5 536,-410.5 768,-410.5 768,-463.5"/>
 <text text-anchor="middle" x="652" y="-448.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#3050</text>
 <text text-anchor="middle" x="652" y="-433.3" font-family="Times,serif" font-size="14.00" fill="#000000">Tag Zebra 1.0.0&#45;rc.0</text>
@@ -86,9 +74,9 @@
 <polygon fill="#000000" stroke="#000000" points="813.6041,-446.1095 823.72,-442.96 813.848,-439.1137 813.6041,-446.1095"/>
 </g>
 <!-- ZcashFoundation/zebra#4882 -->
-<g id="node4" class="node open">
+<g id="node3" class="node open">
 <title>ZcashFoundation/zebra#4882</title>
-<g id="a_node4"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/4882" xlink:title="ZcashFoundation/zebra#4882&#10;Add zcash&#45;lightwalletd /&#10;Build images to required&#10;jobs" target="_blank">
+<g id="a_node3"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/4882" xlink:title="ZcashFoundation/zebra#4882&#10;Add zcash&#45;lightwalletd /&#10;Build images to required&#10;jobs" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="768,-392 536,-392 536,-324 768,-324 768,-392"/>
 <text text-anchor="middle" x="652" y="-376.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#4882</text>
 <text text-anchor="middle" x="652" y="-361.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add zcash&#45;lightwalletd /</text>
@@ -97,6 +85,18 @@
 </a>
 </g>
 </g>
+<!-- ZcashFoundation/zebra#4612 -->
+<g id="node8" class="node open">
+<title>ZcashFoundation/zebra#4612</title>
+<g id="a_node8"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/4612" xlink:title="ZcashFoundation/zebra#4612&#10;ci: Wait for lightwalletd&#10;image rebuild if it has&#10;changed" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="1056,-381 824,-381 824,-313 1056,-313 1056,-381"/>
+<text text-anchor="middle" x="940" y="-365.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#4612</text>
+<text text-anchor="middle" x="940" y="-350.8" font-family="Times,serif" font-size="14.00" fill="#000000">ci: Wait for lightwalletd</text>
+<text text-anchor="middle" x="940" y="-335.8" font-family="Times,serif" font-size="14.00" fill="#000000">image rebuild if it has</text>
+<text text-anchor="middle" x="940" y="-320.8" font-family="Times,serif" font-size="14.00" fill="#000000">changed</text>
+</a>
+</g>
+</g>
 <!-- ZcashFoundation/zebra#4882&#45;&gt;ZcashFoundation/zebra#4612 -->
 <g id="edge2" class="edge">
 <title>ZcashFoundation/zebra#4882&#45;&gt;ZcashFoundation/zebra#4612</title>
@@ -104,9 +104,9 @@
 <polygon fill="#000000" stroke="#000000" points="813.8629,-355.3244 823.72,-351.44 813.592,-348.3296 813.8629,-355.3244"/>
 </g>
 <!-- ZcashFoundation/zebra#4929 -->
-<g id="node5" class="node open">
+<g id="node4" class="node open">
 <title>ZcashFoundation/zebra#4929</title>
-<g id="a_node5"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/4929" xlink:title="ZcashFoundation/zebra#4929&#10;Re&#45;enable beta Rust tests&#10;on Ubuntu" target="_blank">
+<g id="a_node4"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/4929" xlink:title="ZcashFoundation/zebra#4929&#10;Re&#45;enable beta Rust tests&#10;on Ubuntu" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="768,-305.5 536,-305.5 536,-252.5 768,-252.5 768,-305.5"/>
 <text text-anchor="middle" x="652" y="-290.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#4929</text>
 <text text-anchor="middle" x="652" y="-275.3" font-family="Times,serif" font-size="14.00" fill="#000000">Re&#45;enable beta Rust tests</text>
@@ -115,9 +115,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#4529 -->
-<g id="node6" class="node open">
+<g id="node5" class="node open">
 <title>ZcashFoundation/zebra#4529</title>
-<g id="a_node6"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/4529" xlink:title="ZcashFoundation/zebra#4529&#10;Make PRs from external&#10;repositories pass or skip&#10;CI jobs" target="_blank">
+<g id="a_node5"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/4529" xlink:title="ZcashFoundation/zebra#4529&#10;Make PRs from external&#10;repositories pass or skip&#10;CI jobs" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="768,-234 536,-234 536,-166 768,-166 768,-234"/>
 <text text-anchor="middle" x="652" y="-218.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#4529</text>
 <text text-anchor="middle" x="652" y="-203.8" font-family="Times,serif" font-size="14.00" fill="#000000">Make PRs from external</text>
@@ -127,9 +127,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#4857 -->
-<g id="node7" class="node open">
+<g id="node6" class="node open">
 <title>ZcashFoundation/zebra#4857</title>
-<g id="a_node7"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/4857" xlink:title="ZcashFoundation/zebra#4857&#10;Limit the number of&#10;concurrent Google Cloud&#10;jobs" target="_blank">
+<g id="a_node6"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/4857" xlink:title="ZcashFoundation/zebra#4857&#10;Limit the number of&#10;concurrent Google Cloud&#10;jobs" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="768,-148 536,-148 536,-80 768,-80 768,-148"/>
 <text text-anchor="middle" x="652" y="-132.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#4857</text>
 <text text-anchor="middle" x="652" y="-117.8" font-family="Times,serif" font-size="14.00" fill="#000000">Limit the number of</text>
@@ -139,9 +139,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1638 -->
-<g id="node8" class="node open">
+<g id="node7" class="node open">
 <title>ZcashFoundation/zebra#1638</title>
-<g id="a_node8"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1638" xlink:title="ZcashFoundation/zebra#1638&#10;Create PGP keys amongst&#10;security@zfnd.org" target="_blank">
+<g id="a_node7"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1638" xlink:title="ZcashFoundation/zebra#1638&#10;Create PGP keys amongst&#10;security@zfnd.org" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="768,-61.5 536,-61.5 536,-8.5 768,-8.5 768,-61.5"/>
 <text text-anchor="middle" x="652" y="-46.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1638</text>
 <text text-anchor="middle" x="652" y="-31.3" font-family="Times,serif" font-size="14.00" fill="#000000">Create PGP keys amongst</text>
diff --git a/zcash-zf-devops-dag.svg b/zcash-zf-devops-dag.svg
index fb6d6853..9eba1ac3 100644
--- a/zcash-zf-devops-dag.svg
+++ b/zcash-zf-devops-dag.svg
@@ -10,31 +10,19 @@
 <g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 585)">
 <polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-585 1088,-585 1088,4 -4,4"/>
 <g id="clust1" class="cluster">
-<title>cluster_1</title>
-<polygon fill="none" stroke="#0000ff" points="796,-305 796,-412 1084,-412 1084,-305 796,-305"/>
-<text text-anchor="middle" x="940" y="-396.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Zebra as a lightwalletd backend</text>
-</g>
-<g id="clust2" class="cluster">
 <title>cluster_0</title>
 <polygon fill="none" stroke="#0000ff" points="528,0 528,-581 776,-581 776,0 528,0"/>
 <text text-anchor="middle" x="652" y="-565.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Zebra Release Candidates</text>
 </g>
-<!-- ZcashFoundation/zebra#4612 -->
-<g id="node1" class="node open">
-<title>ZcashFoundation/zebra#4612</title>
-<g id="a_node1"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/4612" xlink:title="ZcashFoundation/zebra#4612&#10;ci: Wait for lightwalletd&#10;image rebuild if it has&#10;changed" target="_blank">
-<polygon fill="#c2e0c6" stroke="#000000" points="1056,-381 824,-381 824,-313 1056,-313 1056,-381"/>
-<text text-anchor="middle" x="940" y="-365.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#4612</text>
-<text text-anchor="middle" x="940" y="-350.8" font-family="Times,serif" font-size="14.00" fill="#000000">ci: Wait for lightwalletd</text>
-<text text-anchor="middle" x="940" y="-335.8" font-family="Times,serif" font-size="14.00" fill="#000000">image rebuild if it has</text>
-<text text-anchor="middle" x="940" y="-320.8" font-family="Times,serif" font-size="14.00" fill="#000000">changed</text>
-</a>
-</g>
+<g id="clust2" class="cluster">
+<title>cluster_1</title>
+<polygon fill="none" stroke="#0000ff" points="796,-305 796,-412 1084,-412 1084,-305 796,-305"/>
+<text text-anchor="middle" x="940" y="-396.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Zebra as a lightwalletd backend</text>
 </g>
 <!-- ZcashFoundation/zebra#1615 -->
-<g id="node2" class="node open">
+<g id="node1" class="node open">
 <title>ZcashFoundation/zebra#1615</title>
-<g id="a_node2"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1615" xlink:title="ZcashFoundation/zebra#1615&#10;Zebra release candidate&#10;binaries should be linked&#10;from ZFND website" target="_blank">
+<g id="a_node1"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1615" xlink:title="ZcashFoundation/zebra#1615&#10;Zebra release candidate&#10;binaries should be linked&#10;from ZFND website" target="_blank">
 <polygon fill="#a7c2aa" stroke="#000000" points="768,-550 536,-550 536,-482 768,-482 768,-550"/>
 <text text-anchor="middle" x="652" y="-534.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1615</text>
 <text text-anchor="middle" x="652" y="-519.8" font-family="Times,serif" font-size="14.00" fill="#000000">Zebra release candidate</text>
@@ -44,9 +32,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#3050 -->
-<g id="node3" class="node open">
+<g id="node2" class="node open">
 <title>ZcashFoundation/zebra#3050</title>
-<g id="a_node3"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/3050" xlink:title="ZcashFoundation/zebra#3050&#10;Tag Zebra 1.0.0&#45;rc.0&#10;stable release candidate" target="_blank">
+<g id="a_node2"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/3050" xlink:title="ZcashFoundation/zebra#3050&#10;Tag Zebra 1.0.0&#45;rc.0&#10;stable release candidate" target="_blank">
 <polygon fill="#a7c2aa" stroke="#000000" points="768,-463.5 536,-463.5 536,-410.5 768,-410.5 768,-463.5"/>
 <text text-anchor="middle" x="652" y="-448.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#3050</text>
 <text text-anchor="middle" x="652" y="-433.3" font-family="Times,serif" font-size="14.00" fill="#000000">Tag Zebra 1.0.0&#45;rc.0</text>
@@ -74,9 +62,9 @@
 <polygon fill="#000000" stroke="#000000" points="813.6041,-446.1095 823.72,-442.96 813.848,-439.1137 813.6041,-446.1095"/>
 </g>
 <!-- ZcashFoundation/zebra#4882 -->
-<g id="node4" class="node open">
+<g id="node3" class="node open">
 <title>ZcashFoundation/zebra#4882</title>
-<g id="a_node4"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/4882" xlink:title="ZcashFoundation/zebra#4882&#10;Add zcash&#45;lightwalletd /&#10;Build images to required&#10;jobs" target="_blank">
+<g id="a_node3"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/4882" xlink:title="ZcashFoundation/zebra#4882&#10;Add zcash&#45;lightwalletd /&#10;Build images to required&#10;jobs" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="768,-392 536,-392 536,-324 768,-324 768,-392"/>
 <text text-anchor="middle" x="652" y="-376.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#4882</text>
 <text text-anchor="middle" x="652" y="-361.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add zcash&#45;lightwalletd /</text>
@@ -85,6 +73,18 @@
 </a>
 </g>
 </g>
+<!-- ZcashFoundation/zebra#4612 -->
+<g id="node8" class="node open">
+<title>ZcashFoundation/zebra#4612</title>
+<g id="a_node8"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/4612" xlink:title="ZcashFoundation/zebra#4612&#10;ci: Wait for lightwalletd&#10;image rebuild if it has&#10;changed" target="_blank">
+<polygon fill="#c2e0c6" stroke="#000000" points="1056,-381 824,-381 824,-313 1056,-313 1056,-381"/>
+<text text-anchor="middle" x="940" y="-365.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#4612</text>
+<text text-anchor="middle" x="940" y="-350.8" font-family="Times,serif" font-size="14.00" fill="#000000">ci: Wait for lightwalletd</text>
+<text text-anchor="middle" x="940" y="-335.8" font-family="Times,serif" font-size="14.00" fill="#000000">image rebuild if it has</text>
+<text text-anchor="middle" x="940" y="-320.8" font-family="Times,serif" font-size="14.00" fill="#000000">changed</text>
+</a>
+</g>
+</g>
 <!-- ZcashFoundation/zebra#4882&#45;&gt;ZcashFoundation/zebra#4612 -->
 <g id="edge2" class="edge">
 <title>ZcashFoundation/zebra#4882&#45;&gt;ZcashFoundation/zebra#4612</title>
@@ -92,9 +92,9 @@
 <polygon fill="#000000" stroke="#000000" points="813.8629,-355.3244 823.72,-351.44 813.592,-348.3296 813.8629,-355.3244"/>
 </g>
 <!-- ZcashFoundation/zebra#4929 -->
-<g id="node5" class="node open">
+<g id="node4" class="node open">
 <title>ZcashFoundation/zebra#4929</title>
-<g id="a_node5"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/4929" xlink:title="ZcashFoundation/zebra#4929&#10;Re&#45;enable beta Rust tests&#10;on Ubuntu" target="_blank">
+<g id="a_node4"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/4929" xlink:title="ZcashFoundation/zebra#4929&#10;Re&#45;enable beta Rust tests&#10;on Ubuntu" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="768,-305.5 536,-305.5 536,-252.5 768,-252.5 768,-305.5"/>
 <text text-anchor="middle" x="652" y="-290.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#4929</text>
 <text text-anchor="middle" x="652" y="-275.3" font-family="Times,serif" font-size="14.00" fill="#000000">Re&#45;enable beta Rust tests</text>
@@ -103,9 +103,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#4529 -->
-<g id="node6" class="node open">
+<g id="node5" class="node open">
 <title>ZcashFoundation/zebra#4529</title>
-<g id="a_node6"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/4529" xlink:title="ZcashFoundation/zebra#4529&#10;Make PRs from external&#10;repositories pass or skip&#10;CI jobs" target="_blank">
+<g id="a_node5"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/4529" xlink:title="ZcashFoundation/zebra#4529&#10;Make PRs from external&#10;repositories pass or skip&#10;CI jobs" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="768,-234 536,-234 536,-166 768,-166 768,-234"/>
 <text text-anchor="middle" x="652" y="-218.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#4529</text>
 <text text-anchor="middle" x="652" y="-203.8" font-family="Times,serif" font-size="14.00" fill="#000000">Make PRs from external</text>
@@ -115,9 +115,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#4857 -->
-<g id="node7" class="node open">
+<g id="node6" class="node open">
 <title>ZcashFoundation/zebra#4857</title>
-<g id="a_node7"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/4857" xlink:title="ZcashFoundation/zebra#4857&#10;Limit the number of&#10;concurrent Google Cloud&#10;jobs" target="_blank">
+<g id="a_node6"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/4857" xlink:title="ZcashFoundation/zebra#4857&#10;Limit the number of&#10;concurrent Google Cloud&#10;jobs" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="768,-148 536,-148 536,-80 768,-80 768,-148"/>
 <text text-anchor="middle" x="652" y="-132.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#4857</text>
 <text text-anchor="middle" x="652" y="-117.8" font-family="Times,serif" font-size="14.00" fill="#000000">Limit the number of</text>
@@ -127,9 +127,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/zebra#1638 -->
-<g id="node8" class="node open">
+<g id="node7" class="node open">
 <title>ZcashFoundation/zebra#1638</title>
-<g id="a_node8"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1638" xlink:title="ZcashFoundation/zebra#1638&#10;Create PGP keys amongst&#10;security@zfnd.org" target="_blank">
+<g id="a_node7"><a xlink:href="https://github.com/ZcashFoundation/zebra/issues/1638" xlink:title="ZcashFoundation/zebra#1638&#10;Create PGP keys amongst&#10;security@zfnd.org" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="768,-61.5 536,-61.5 536,-8.5 768,-8.5 768,-61.5"/>
 <text text-anchor="middle" x="652" y="-46.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/zebra#1638</text>
 <text text-anchor="middle" x="652" y="-31.3" font-family="Times,serif" font-size="14.00" fill="#000000">Create PGP keys amongst</text>
diff --git a/zcash-zf-frost-dag.html b/zcash-zf-frost-dag.html
index b0745696..ccd38629 100644
--- a/zcash-zf-frost-dag.html
+++ b/zcash-zf-frost-dag.html
@@ -27,15 +27,15 @@
 <text text-anchor="middle" x="868.25" y="-404.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: v8</text>
 </g>
 <g id="clust2" class="cluster">
-<title>cluster_1</title>
-<polygon fill="none" stroke="#0000ff" points="1011.5,0 1011.5,-219 1235.5,-219 1235.5,0 1011.5,0"/>
-<text text-anchor="middle" x="1123.5" y="-203.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Remaining Curves</text>
-</g>
-<g id="clust3" class="cluster">
 <title>cluster_4</title>
 <polygon fill="none" stroke="#0000ff" points="0,-428 0,-955 729.5,-955 729.5,-428 0,-428"/>
 <text text-anchor="middle" x="364.75" y="-939.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Zcon&#45;ready FROST</text>
 </g>
+<g id="clust3" class="cluster">
+<title>cluster_1</title>
+<polygon fill="none" stroke="#0000ff" points="1011.5,0 1011.5,-219 1235.5,-219 1235.5,0 1011.5,0"/>
+<text text-anchor="middle" x="1123.5" y="-203.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Remaining Curves</text>
+</g>
 <g id="clust4" class="cluster">
 <title>cluster_2</title>
 <polygon fill="none" stroke="#0000ff" points="6.5,-963 6.5,-1070 481,-1070 481,-963 6.5,-963"/>
@@ -93,9 +93,9 @@
 <polygon fill="#000000" stroke="#000000" points="1008.5142,-312.6584 1019.1,-312.22 1010.5513,-305.9614 1008.5142,-312.6584"/>
 </g>
 <!-- ZcashFoundation/frost#70 -->
-<g id="node6" class="node open">
+<g id="node16" class="node open">
 <title>ZcashFoundation/frost#70</title>
-<g id="a_node6"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/70" xlink:title="ZcashFoundation/frost#70&#10;Add Ed25519 support" target="_blank">
+<g id="a_node16"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/70" xlink:title="ZcashFoundation/frost#70&#10;Add Ed25519 support" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" points="1227.5,-188 1019.5,-188 1019.5,-150 1227.5,-150 1227.5,-188"/>
 <text text-anchor="middle" x="1123.5" y="-172.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#70</text>
 <text text-anchor="middle" x="1123.5" y="-157.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Ed25519 support</text>
@@ -109,9 +109,9 @@
 <polygon fill="#000000" stroke="#000000" points="1066.1595,-194.9793 1074.2,-188.08 1063.612,-188.4594 1066.1595,-194.9793"/>
 </g>
 <!-- ZcashFoundation/frost#19 -->
-<g id="node7" class="node open">
+<g id="node17" class="node open">
 <title>ZcashFoundation/frost#19</title>
-<g id="a_node7"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/19" xlink:title="ZcashFoundation/frost#19&#10;`frost&#45;secp256k1`:&#10;implement FROST on&#10;Secp256k1 curve" target="_blank">
+<g id="a_node17"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/19" xlink:title="ZcashFoundation/frost#19&#10;`frost&#45;secp256k1`:&#10;implement FROST on&#10;Secp256k1 curve" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" points="1227.5,-132 1019.5,-132 1019.5,-64 1227.5,-64 1227.5,-132"/>
 <text text-anchor="middle" x="1123.5" y="-116.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#19</text>
 <text text-anchor="middle" x="1123.5" y="-101.8" font-family="Times,serif" font-size="14.00" fill="#000000">`frost&#45;secp256k1`:</text>
@@ -127,9 +127,9 @@
 <polygon fill="#000000" stroke="#000000" points="1020.4394,-139.8588 1027.6,-132.05 1017.1327,-133.689 1020.4394,-139.8588"/>
 </g>
 <!-- ZcashFoundation/frost#71 -->
-<g id="node8" class="node open">
+<g id="node18" class="node open">
 <title>ZcashFoundation/frost#71</title>
-<g id="a_node8"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/71" xlink:title="ZcashFoundation/frost#71&#10;Add Ed448 support" target="_blank">
+<g id="a_node18"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/71" xlink:title="ZcashFoundation/frost#71&#10;Add Ed448 support" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" points="1227.5,-46 1019.5,-46 1019.5,-8 1227.5,-8 1227.5,-46"/>
 <text text-anchor="middle" x="1123.5" y="-30.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#71</text>
 <text text-anchor="middle" x="1123.5" y="-15.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Ed448 support</text>
@@ -197,9 +197,9 @@
 <polygon fill="#000000" stroke="#000000" points="756.2711,-271.4077 766.24,-267.82 756.2097,-264.4079 756.2711,-271.4077"/>
 </g>
 <!-- ZcashFoundation/frost#86 -->
-<g id="node9" class="node open">
+<g id="node6" class="node open">
 <title>ZcashFoundation/frost#86</title>
-<g id="a_node9"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/86" xlink:title="ZcashFoundation/frost#86&#10;frost&#45;core: update for&#10;spec version 6&amp;7" target="_blank">
+<g id="a_node6"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/86" xlink:title="ZcashFoundation/frost#86&#10;frost&#45;core: update for&#10;spec version 6&amp;7" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" points="473,-679.5 265,-679.5 265,-626.5 473,-626.5 473,-679.5"/>
 <text text-anchor="middle" x="369" y="-664.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#86</text>
 <text text-anchor="middle" x="369" y="-649.3" font-family="Times,serif" font-size="14.00" fill="#000000">frost&#45;core: update for</text>
@@ -214,9 +214,9 @@
 <polygon fill="#000000" stroke="#000000" points="540.158,-397.3164 546.76,-389.03 536.4315,-391.3907 540.158,-397.3164"/>
 </g>
 <!-- ZcashFoundation/frost#79 -->
-<g id="node10" class="node open">
+<g id="node7" class="node open">
 <title>ZcashFoundation/frost#79</title>
-<g id="a_node10"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/79" xlink:title="ZcashFoundation/frost#79&#10;Publish `frost&#45;` crates" target="_blank">
+<g id="a_node7"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/79" xlink:title="ZcashFoundation/frost#79&#10;Publish `frost&#45;` crates" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" points="721.5,-794 513.5,-794 513.5,-756 721.5,-756 721.5,-794"/>
 <text text-anchor="middle" x="617.5" y="-778.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#79</text>
 <text text-anchor="middle" x="617.5" y="-763.8" font-family="Times,serif" font-size="14.00" fill="#000000">Publish `frost&#45;` crates</text>
@@ -230,9 +230,9 @@
 <polygon fill="#000000" stroke="#000000" points="581.2494,-752.8812 591.44,-755.78 585.2813,-747.159 581.2494,-752.8812"/>
 </g>
 <!-- ZcashFoundation/frost#95 -->
-<g id="node11" class="node open">
+<g id="node8" class="node open">
 <title>ZcashFoundation/frost#95</title>
-<g id="a_node11"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/95" xlink:title="ZcashFoundation/frost#95&#10;Flesh out all rustdoc in&#10;frost&#45;p256 public API" target="_blank">
+<g id="a_node8"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/95" xlink:title="ZcashFoundation/frost#95&#10;Flesh out all rustdoc in&#10;frost&#45;p256 public API" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="473,-923.5 265,-923.5 265,-870.5 473,-870.5 473,-923.5"/>
 <text text-anchor="middle" x="369" y="-908.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#95</text>
 <text text-anchor="middle" x="369" y="-893.3" font-family="Times,serif" font-size="14.00" fill="#000000">Flesh out all rustdoc in</text>
@@ -247,9 +247,9 @@
 <polygon fill="#000000" stroke="#000000" points="585.2813,-802.841 591.44,-794.22 581.2494,-797.1188 585.2813,-802.841"/>
 </g>
 <!-- ZcashFoundation/frost#55 -->
-<g id="node12" class="node open">
+<g id="node9" class="node open">
 <title>ZcashFoundation/frost#55</title>
-<g id="a_node12"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/55" xlink:title="ZcashFoundation/frost#55&#10;Rename participant&#10;indexes to participant&#10;identifiers or IDs" target="_blank">
+<g id="a_node9"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/55" xlink:title="ZcashFoundation/frost#55&#10;Rename participant&#10;indexes to participant&#10;identifiers or IDs" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="473,-852 265,-852 265,-784 473,-784 473,-852"/>
 <text text-anchor="middle" x="369" y="-836.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#55</text>
 <text text-anchor="middle" x="369" y="-821.8" font-family="Times,serif" font-size="14.00" fill="#000000">Rename participant</text>
@@ -265,9 +265,9 @@
 <polygon fill="#000000" stroke="#000000" points="504.2022,-798.152 513.46,-793 503.01,-791.2542 504.2022,-798.152"/>
 </g>
 <!-- ZcashFoundation/frost#61 -->
-<g id="node13" class="node open">
+<g id="node10" class="node open">
 <title>ZcashFoundation/frost#61</title>
-<g id="a_node13"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/61" xlink:title="ZcashFoundation/frost#61&#10;Flesh out all rustdoc in&#10;`frost&#45;ristretto255`&#10;public API" target="_blank">
+<g id="a_node10"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/61" xlink:title="ZcashFoundation/frost#61&#10;Flesh out all rustdoc in&#10;`frost&#45;ristretto255`&#10;public API" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="473,-766 265,-766 265,-698 473,-698 473,-766"/>
 <text text-anchor="middle" x="369" y="-750.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#61</text>
 <text text-anchor="middle" x="369" y="-735.8" font-family="Times,serif" font-size="14.00" fill="#000000">Flesh out all rustdoc in</text>
@@ -283,9 +283,9 @@
 <polygon fill="#000000" stroke="#000000" points="503.01,-758.7458 513.46,-757 504.2022,-751.848 503.01,-758.7458"/>
 </g>
 <!-- ZcashFoundation/frost#92 -->
-<g id="node14" class="node open">
+<g id="node11" class="node open">
 <title>ZcashFoundation/frost#92</title>
-<g id="a_node14"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/92" xlink:title="ZcashFoundation/frost#92&#10;v6/v7: Use per&#45;signer&#10;values of rho to mitigate&#10;protocol malleability" target="_blank">
+<g id="a_node11"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/92" xlink:title="ZcashFoundation/frost#92&#10;v6/v7: Use per&#45;signer&#10;values of rho to mitigate&#10;protocol malleability" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="222.5,-924 14.5,-924 14.5,-856 222.5,-856 222.5,-924"/>
 <text text-anchor="middle" x="118.5" y="-908.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#92</text>
 <text text-anchor="middle" x="118.5" y="-893.8" font-family="Times,serif" font-size="14.00" fill="#000000">v6/v7: Use per&#45;signer</text>
@@ -301,9 +301,9 @@
 <polygon fill="#000000" stroke="#000000" points="269.9016,-688.9262 275.11,-679.7 265.2848,-683.6645 269.9016,-688.9262"/>
 </g>
 <!-- ZcashFoundation/frost#91 -->
-<g id="node15" class="node open">
+<g id="node12" class="node open">
 <title>ZcashFoundation/frost#91</title>
-<g id="a_node15"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/91" xlink:title="ZcashFoundation/frost#91&#10;v6/v7: Make verification&#10;a per&#45;ciphersuite&#10;functionality" target="_blank">
+<g id="a_node12"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/91" xlink:title="ZcashFoundation/frost#91&#10;v6/v7: Make verification&#10;a per&#45;ciphersuite&#10;functionality" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="222.5,-838 14.5,-838 14.5,-770 222.5,-770 222.5,-838"/>
 <text text-anchor="middle" x="118.5" y="-822.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#91</text>
 <text text-anchor="middle" x="118.5" y="-807.8" font-family="Times,serif" font-size="14.00" fill="#000000">v6/v7: Make verification</text>
@@ -319,9 +319,9 @@
 <polygon fill="#000000" stroke="#000000" points="271.3404,-688.3116 277.54,-679.72 267.3357,-682.5703 271.3404,-688.3116"/>
 </g>
 <!-- ZcashFoundation/frost#47 -->
-<g id="node16" class="node open">
+<g id="node13" class="node open">
 <title>ZcashFoundation/frost#47</title>
-<g id="a_node16"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/47" xlink:title="ZcashFoundation/frost#47&#10;Note in Ristretto255 near&#10;PublicKeyPackage where we&#10;impl&#10;`derive_group_info()` for&#10;v05" target="_blank">
+<g id="a_node13"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/47" xlink:title="ZcashFoundation/frost#47&#10;Note in Ristretto255 near&#10;PublicKeyPackage where we&#10;impl&#10;`derive_group_info()` for&#10;v05" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="229,-752 8,-752 8,-654 229,-654 229,-752"/>
 <text text-anchor="middle" x="118.5" y="-736.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#47</text>
 <text text-anchor="middle" x="118.5" y="-721.8" font-family="Times,serif" font-size="14.00" fill="#000000">Note in Ristretto255 near</text>
@@ -333,9 +333,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/frost#59 -->
-<g id="node17" class="node open">
+<g id="node14" class="node open">
 <title>ZcashFoundation/frost#59</title>
-<g id="a_node17"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/59" xlink:title="ZcashFoundation/frost#59&#10;Rename&#10;`frost::keys::{Secret,&#10;Public}`to indicate&#10;signing participants&#39;&#10;shares, not full keys." target="_blank">
+<g id="a_node14"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/59" xlink:title="ZcashFoundation/frost#59&#10;Rename&#10;`frost::keys::{Secret,&#10;Public}`to indicate&#10;signing participants&#39;&#10;shares, not full keys." target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="222.5,-636 14.5,-636 14.5,-538 222.5,-538 222.5,-636"/>
 <text text-anchor="middle" x="118.5" y="-620.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#59</text>
 <text text-anchor="middle" x="118.5" y="-605.8" font-family="Times,serif" font-size="14.00" fill="#000000">Rename</text>
@@ -347,9 +347,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/frost#74 -->
-<g id="node18" class="node open">
+<g id="node15" class="node open">
 <title>ZcashFoundation/frost#74</title>
-<g id="a_node18"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/74" xlink:title="ZcashFoundation/frost#74&#10;Port fresh keygen test&#10;from `frost&#45;core` to&#10;`frost&#45;ristretto` and&#10;other dependent crates" target="_blank">
+<g id="a_node15"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/74" xlink:title="ZcashFoundation/frost#74&#10;Port fresh keygen test&#10;from `frost&#45;core` to&#10;`frost&#45;ristretto` and&#10;other dependent crates" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="222.5,-519.5 14.5,-519.5 14.5,-436.5 222.5,-436.5 222.5,-519.5"/>
 <text text-anchor="middle" x="118.5" y="-504.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#74</text>
 <text text-anchor="middle" x="118.5" y="-489.3" font-family="Times,serif" font-size="14.00" fill="#000000">Port fresh keygen test</text>
diff --git a/zcash-zf-frost-dag.svg b/zcash-zf-frost-dag.svg
index 2e474f72..6e4e735e 100644
--- a/zcash-zf-frost-dag.svg
+++ b/zcash-zf-frost-dag.svg
@@ -15,15 +15,15 @@
 <text text-anchor="middle" x="868.25" y="-404.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: v8</text>
 </g>
 <g id="clust2" class="cluster">
-<title>cluster_1</title>
-<polygon fill="none" stroke="#0000ff" points="1011.5,0 1011.5,-219 1235.5,-219 1235.5,0 1011.5,0"/>
-<text text-anchor="middle" x="1123.5" y="-203.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Remaining Curves</text>
-</g>
-<g id="clust3" class="cluster">
 <title>cluster_4</title>
 <polygon fill="none" stroke="#0000ff" points="0,-428 0,-955 729.5,-955 729.5,-428 0,-428"/>
 <text text-anchor="middle" x="364.75" y="-939.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Zcon&#45;ready FROST</text>
 </g>
+<g id="clust3" class="cluster">
+<title>cluster_1</title>
+<polygon fill="none" stroke="#0000ff" points="1011.5,0 1011.5,-219 1235.5,-219 1235.5,0 1011.5,0"/>
+<text text-anchor="middle" x="1123.5" y="-203.8" font-family="Times,serif" font-size="14.00" fill="#000000">Epic: Remaining Curves</text>
+</g>
 <g id="clust4" class="cluster">
 <title>cluster_2</title>
 <polygon fill="none" stroke="#0000ff" points="6.5,-963 6.5,-1070 481,-1070 481,-963 6.5,-963"/>
@@ -81,9 +81,9 @@
 <polygon fill="#000000" stroke="#000000" points="1008.5142,-312.6584 1019.1,-312.22 1010.5513,-305.9614 1008.5142,-312.6584"/>
 </g>
 <!-- ZcashFoundation/frost#70 -->
-<g id="node6" class="node open">
+<g id="node16" class="node open">
 <title>ZcashFoundation/frost#70</title>
-<g id="a_node6"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/70" xlink:title="ZcashFoundation/frost#70&#10;Add Ed25519 support" target="_blank">
+<g id="a_node16"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/70" xlink:title="ZcashFoundation/frost#70&#10;Add Ed25519 support" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" points="1227.5,-188 1019.5,-188 1019.5,-150 1227.5,-150 1227.5,-188"/>
 <text text-anchor="middle" x="1123.5" y="-172.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#70</text>
 <text text-anchor="middle" x="1123.5" y="-157.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Ed25519 support</text>
@@ -97,9 +97,9 @@
 <polygon fill="#000000" stroke="#000000" points="1066.1595,-194.9793 1074.2,-188.08 1063.612,-188.4594 1066.1595,-194.9793"/>
 </g>
 <!-- ZcashFoundation/frost#19 -->
-<g id="node7" class="node open">
+<g id="node17" class="node open">
 <title>ZcashFoundation/frost#19</title>
-<g id="a_node7"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/19" xlink:title="ZcashFoundation/frost#19&#10;`frost&#45;secp256k1`:&#10;implement FROST on&#10;Secp256k1 curve" target="_blank">
+<g id="a_node17"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/19" xlink:title="ZcashFoundation/frost#19&#10;`frost&#45;secp256k1`:&#10;implement FROST on&#10;Secp256k1 curve" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" points="1227.5,-132 1019.5,-132 1019.5,-64 1227.5,-64 1227.5,-132"/>
 <text text-anchor="middle" x="1123.5" y="-116.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#19</text>
 <text text-anchor="middle" x="1123.5" y="-101.8" font-family="Times,serif" font-size="14.00" fill="#000000">`frost&#45;secp256k1`:</text>
@@ -115,9 +115,9 @@
 <polygon fill="#000000" stroke="#000000" points="1020.4394,-139.8588 1027.6,-132.05 1017.1327,-133.689 1020.4394,-139.8588"/>
 </g>
 <!-- ZcashFoundation/frost#71 -->
-<g id="node8" class="node open">
+<g id="node18" class="node open">
 <title>ZcashFoundation/frost#71</title>
-<g id="a_node8"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/71" xlink:title="ZcashFoundation/frost#71&#10;Add Ed448 support" target="_blank">
+<g id="a_node18"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/71" xlink:title="ZcashFoundation/frost#71&#10;Add Ed448 support" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" points="1227.5,-46 1019.5,-46 1019.5,-8 1227.5,-8 1227.5,-46"/>
 <text text-anchor="middle" x="1123.5" y="-30.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#71</text>
 <text text-anchor="middle" x="1123.5" y="-15.8" font-family="Times,serif" font-size="14.00" fill="#000000">Add Ed448 support</text>
@@ -185,9 +185,9 @@
 <polygon fill="#000000" stroke="#000000" points="756.2711,-271.4077 766.24,-267.82 756.2097,-264.4079 756.2711,-271.4077"/>
 </g>
 <!-- ZcashFoundation/frost#86 -->
-<g id="node9" class="node open">
+<g id="node6" class="node open">
 <title>ZcashFoundation/frost#86</title>
-<g id="a_node9"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/86" xlink:title="ZcashFoundation/frost#86&#10;frost&#45;core: update for&#10;spec version 6&amp;7" target="_blank">
+<g id="a_node6"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/86" xlink:title="ZcashFoundation/frost#86&#10;frost&#45;core: update for&#10;spec version 6&amp;7" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" points="473,-679.5 265,-679.5 265,-626.5 473,-626.5 473,-679.5"/>
 <text text-anchor="middle" x="369" y="-664.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#86</text>
 <text text-anchor="middle" x="369" y="-649.3" font-family="Times,serif" font-size="14.00" fill="#000000">frost&#45;core: update for</text>
@@ -202,9 +202,9 @@
 <polygon fill="#000000" stroke="#000000" points="540.158,-397.3164 546.76,-389.03 536.4315,-391.3907 540.158,-397.3164"/>
 </g>
 <!-- ZcashFoundation/frost#79 -->
-<g id="node10" class="node open">
+<g id="node7" class="node open">
 <title>ZcashFoundation/frost#79</title>
-<g id="a_node10"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/79" xlink:title="ZcashFoundation/frost#79&#10;Publish `frost&#45;` crates" target="_blank">
+<g id="a_node7"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/79" xlink:title="ZcashFoundation/frost#79&#10;Publish `frost&#45;` crates" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" points="721.5,-794 513.5,-794 513.5,-756 721.5,-756 721.5,-794"/>
 <text text-anchor="middle" x="617.5" y="-778.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#79</text>
 <text text-anchor="middle" x="617.5" y="-763.8" font-family="Times,serif" font-size="14.00" fill="#000000">Publish `frost&#45;` crates</text>
@@ -218,9 +218,9 @@
 <polygon fill="#000000" stroke="#000000" points="581.2494,-752.8812 591.44,-755.78 585.2813,-747.159 581.2494,-752.8812"/>
 </g>
 <!-- ZcashFoundation/frost#95 -->
-<g id="node11" class="node open">
+<g id="node8" class="node open">
 <title>ZcashFoundation/frost#95</title>
-<g id="a_node11"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/95" xlink:title="ZcashFoundation/frost#95&#10;Flesh out all rustdoc in&#10;frost&#45;p256 public API" target="_blank">
+<g id="a_node8"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/95" xlink:title="ZcashFoundation/frost#95&#10;Flesh out all rustdoc in&#10;frost&#45;p256 public API" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="473,-923.5 265,-923.5 265,-870.5 473,-870.5 473,-923.5"/>
 <text text-anchor="middle" x="369" y="-908.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#95</text>
 <text text-anchor="middle" x="369" y="-893.3" font-family="Times,serif" font-size="14.00" fill="#000000">Flesh out all rustdoc in</text>
@@ -235,9 +235,9 @@
 <polygon fill="#000000" stroke="#000000" points="585.2813,-802.841 591.44,-794.22 581.2494,-797.1188 585.2813,-802.841"/>
 </g>
 <!-- ZcashFoundation/frost#55 -->
-<g id="node12" class="node open">
+<g id="node9" class="node open">
 <title>ZcashFoundation/frost#55</title>
-<g id="a_node12"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/55" xlink:title="ZcashFoundation/frost#55&#10;Rename participant&#10;indexes to participant&#10;identifiers or IDs" target="_blank">
+<g id="a_node9"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/55" xlink:title="ZcashFoundation/frost#55&#10;Rename participant&#10;indexes to participant&#10;identifiers or IDs" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="473,-852 265,-852 265,-784 473,-784 473,-852"/>
 <text text-anchor="middle" x="369" y="-836.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#55</text>
 <text text-anchor="middle" x="369" y="-821.8" font-family="Times,serif" font-size="14.00" fill="#000000">Rename participant</text>
@@ -253,9 +253,9 @@
 <polygon fill="#000000" stroke="#000000" points="504.2022,-798.152 513.46,-793 503.01,-791.2542 504.2022,-798.152"/>
 </g>
 <!-- ZcashFoundation/frost#61 -->
-<g id="node13" class="node open">
+<g id="node10" class="node open">
 <title>ZcashFoundation/frost#61</title>
-<g id="a_node13"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/61" xlink:title="ZcashFoundation/frost#61&#10;Flesh out all rustdoc in&#10;`frost&#45;ristretto255`&#10;public API" target="_blank">
+<g id="a_node10"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/61" xlink:title="ZcashFoundation/frost#61&#10;Flesh out all rustdoc in&#10;`frost&#45;ristretto255`&#10;public API" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="473,-766 265,-766 265,-698 473,-698 473,-766"/>
 <text text-anchor="middle" x="369" y="-750.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#61</text>
 <text text-anchor="middle" x="369" y="-735.8" font-family="Times,serif" font-size="14.00" fill="#000000">Flesh out all rustdoc in</text>
@@ -271,9 +271,9 @@
 <polygon fill="#000000" stroke="#000000" points="503.01,-758.7458 513.46,-757 504.2022,-751.848 503.01,-758.7458"/>
 </g>
 <!-- ZcashFoundation/frost#92 -->
-<g id="node14" class="node open">
+<g id="node11" class="node open">
 <title>ZcashFoundation/frost#92</title>
-<g id="a_node14"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/92" xlink:title="ZcashFoundation/frost#92&#10;v6/v7: Use per&#45;signer&#10;values of rho to mitigate&#10;protocol malleability" target="_blank">
+<g id="a_node11"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/92" xlink:title="ZcashFoundation/frost#92&#10;v6/v7: Use per&#45;signer&#10;values of rho to mitigate&#10;protocol malleability" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="222.5,-924 14.5,-924 14.5,-856 222.5,-856 222.5,-924"/>
 <text text-anchor="middle" x="118.5" y="-908.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#92</text>
 <text text-anchor="middle" x="118.5" y="-893.8" font-family="Times,serif" font-size="14.00" fill="#000000">v6/v7: Use per&#45;signer</text>
@@ -289,9 +289,9 @@
 <polygon fill="#000000" stroke="#000000" points="269.9016,-688.9262 275.11,-679.7 265.2848,-683.6645 269.9016,-688.9262"/>
 </g>
 <!-- ZcashFoundation/frost#91 -->
-<g id="node15" class="node open">
+<g id="node12" class="node open">
 <title>ZcashFoundation/frost#91</title>
-<g id="a_node15"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/91" xlink:title="ZcashFoundation/frost#91&#10;v6/v7: Make verification&#10;a per&#45;ciphersuite&#10;functionality" target="_blank">
+<g id="a_node12"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/91" xlink:title="ZcashFoundation/frost#91&#10;v6/v7: Make verification&#10;a per&#45;ciphersuite&#10;functionality" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="222.5,-838 14.5,-838 14.5,-770 222.5,-770 222.5,-838"/>
 <text text-anchor="middle" x="118.5" y="-822.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#91</text>
 <text text-anchor="middle" x="118.5" y="-807.8" font-family="Times,serif" font-size="14.00" fill="#000000">v6/v7: Make verification</text>
@@ -307,9 +307,9 @@
 <polygon fill="#000000" stroke="#000000" points="271.3404,-688.3116 277.54,-679.72 267.3357,-682.5703 271.3404,-688.3116"/>
 </g>
 <!-- ZcashFoundation/frost#47 -->
-<g id="node16" class="node open">
+<g id="node13" class="node open">
 <title>ZcashFoundation/frost#47</title>
-<g id="a_node16"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/47" xlink:title="ZcashFoundation/frost#47&#10;Note in Ristretto255 near&#10;PublicKeyPackage where we&#10;impl&#10;`derive_group_info()` for&#10;v05" target="_blank">
+<g id="a_node13"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/47" xlink:title="ZcashFoundation/frost#47&#10;Note in Ristretto255 near&#10;PublicKeyPackage where we&#10;impl&#10;`derive_group_info()` for&#10;v05" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="229,-752 8,-752 8,-654 229,-654 229,-752"/>
 <text text-anchor="middle" x="118.5" y="-736.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#47</text>
 <text text-anchor="middle" x="118.5" y="-721.8" font-family="Times,serif" font-size="14.00" fill="#000000">Note in Ristretto255 near</text>
@@ -321,9 +321,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/frost#59 -->
-<g id="node17" class="node open">
+<g id="node14" class="node open">
 <title>ZcashFoundation/frost#59</title>
-<g id="a_node17"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/59" xlink:title="ZcashFoundation/frost#59&#10;Rename&#10;`frost::keys::{Secret,&#10;Public}`to indicate&#10;signing participants&#39;&#10;shares, not full keys." target="_blank">
+<g id="a_node14"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/59" xlink:title="ZcashFoundation/frost#59&#10;Rename&#10;`frost::keys::{Secret,&#10;Public}`to indicate&#10;signing participants&#39;&#10;shares, not full keys." target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="222.5,-636 14.5,-636 14.5,-538 222.5,-538 222.5,-636"/>
 <text text-anchor="middle" x="118.5" y="-620.8" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#59</text>
 <text text-anchor="middle" x="118.5" y="-605.8" font-family="Times,serif" font-size="14.00" fill="#000000">Rename</text>
@@ -335,9 +335,9 @@
 </g>
 </g>
 <!-- ZcashFoundation/frost#74 -->
-<g id="node18" class="node open">
+<g id="node15" class="node open">
 <title>ZcashFoundation/frost#74</title>
-<g id="a_node18"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/74" xlink:title="ZcashFoundation/frost#74&#10;Port fresh keygen test&#10;from `frost&#45;core` to&#10;`frost&#45;ristretto` and&#10;other dependent crates" target="_blank">
+<g id="a_node15"><a xlink:href="https://github.com/ZcashFoundation/frost/issues/74" xlink:title="ZcashFoundation/frost#74&#10;Port fresh keygen test&#10;from `frost&#45;core` to&#10;`frost&#45;ristretto` and&#10;other dependent crates" target="_blank">
 <polygon fill="#c2e0c6" stroke="#000000" stroke-width="2" points="222.5,-519.5 14.5,-519.5 14.5,-436.5 222.5,-436.5 222.5,-519.5"/>
 <text text-anchor="middle" x="118.5" y="-504.3" font-family="Times,serif" font-size="14.00" fill="#000000">ZcashFoundation/frost#74</text>
 <text text-anchor="middle" x="118.5" y="-489.3" font-family="Times,serif" font-size="14.00" fill="#000000">Port fresh keygen test</text>