Merge "Implements CanvasView control" into devel/master