nvda

d79db6e1 - Merge branch 't3874'. Fixes #3874