First commit of CanvasMark from svn repo r553