nvda

Beta to master, to incorporate the changes for 2021.3beta2

#13030

Merged