Pull changes from nextgen_csharp_module into nextgen.