nvda

c2924236 - Merge remote-tracking branch 'origin/master' into mergeBetaToMaster