nvda

0b2a3082 - Merge branch 't3873'. Fixes #3873