nvda

569bf8f0 - Merge branch 't4095'. Fixes #4095