This should wait for some upstream work, just don't want to lose it locally for now. I'll switch this from draft and update the description when it's ready.