nvda

c95654dc - Merge branch 't4374'. Fixes #4374