Some more R2C02.cs implementation
Resolve merge conflicts.