Merge C# into main