I've now tested that beta branch, and it appears to solve the problem.
I will say - it wasn't a perfect like-for-like test as I had to use the amd64 build rather than the arm64 build, as I couldn't figure out how to sign the arm64 build! But assuming that doesn't impact things, then yes, it seems that's solved the problem.