nvda

Update master to resolve orphaned changes on next

#7739

Merged