Draft: Fix failing tests introduced with !2436

Merge request reports

Loading