Simon, I think Sebastian already ran into this issue and reported it as #25406. You might try cherry-picking the commit from !13469.

Best,

Sam