Closed peaBerberian closed 3 weeks ago
This is a backport of #1530 for the v3
I plan to merge that one directly, as it's exactly the same as already-reviewed #1530, it doesn't seem risky, and some partners want it today.
My apologies if it turns out to break everything
This is a backport of #1530 for the v3