nvda

5bd2574e - Merge branch 'javaImprovements'. Fixes #3753, #3754, #3755, #3756, #3757, #3770