nvda

f859d5e5 - Merge branch 't5390'. Fixes #5390