Merge "Added support for more CanvasOps"