Core C# changes for Unity3d #5431764503338