Add files to .NET 4 project.
Merge branch 'hotfix-2.3.7'