nvda
Partial revert of PR #11856
#12695
Merged

Loading