Merge branch 'canvas' into dev
updated canvas size