Merge "Added C# control / property registration to devel API" into devel/master