This comment has been minimized.

I threw together something in #7761, but not sure if this is what we had in mind, also not able to run tests yet locally. I'll try again in the future, or someone can feel free to steal it. Thanks for chiming in.