From 81dcf2b547bacc42bd9cf8ccaccd3d7164e69926 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Mon, 26 Aug 2024 10:00:11 +1000
Subject: [PATCH] Merge point for 2024q3 breaking change -- take 2