nvda

44e8ba7b - Merge branch 't3888'. Fixes #3888