nvda

a87940f0 - Merge branch 't4174'. Fixes #4174