nvda

27c857f5 - Merge branch 't4258'. Fixes #4258