nvda
Add changes from #13242
#13291
Merged

Loading