Merge HEAD with csharp client changes