Backport from new C# examples