[csharp] fix build?
Merge branch 'master' into simplify-csharp-build