I now have a branch (tracking 2.2.16 for now) for the combined rolling upgrade fixes for Weld. I had to re-fork the repository freshly.
https://github.com/flowlogix/weld-core/commits/rolling-upgrade-patch-2.2.16