nvda

c56a4017 - Merge branch 't3570' into t1271a2