In D21684#476228, @emaste wrote:

We need to figure out how to get all of this upstream as well.