nvda

08e65037 - Merge branch 't3834'. Fixes #3834, #4104