If you're ok, could you try this solution in another PR?
Then we can merge this one after fixing the other CR.