@raphael-proust This will be needed for !4547 (merged) but I was advised to make this in a separate MR.