Core C# changes #5431764503338