Merge "C# control dashboard demo" into devel/master