Thanks for the PRs! Yeah, we'll definitely include one or the other in the next release. I don't see too much difference so will flip a coin unless someone would like to argue for one over the other :)

I'd argue the #8673 is better on the basis that it fixes the problem right next to the place where the problem is created, rather than relying on remembering later that a fix is needed for one specific library case. However, that's a strong opinion, weakly held; both solutions work.

In terms of timing - while it's great this will be in the next release, the bug prevents testing of macOS builds on a local machine, so I'd argue it would be beneficial to merge it sooner rather than later. In order to test my iOS patch, I need to have include a version of this patch.