nvda
Fix regressions from #10919
#10932
Merged

Loading