the thing about #6217 that makes me feel like it might be ok to include in a hotfix even if it is a lot of changes is that it doesn't change the external interface to the native toolchain at all (which is why it was so easy to merge into the two other PRs). let me know if that rationale makes sense.