Added height/width to canvases
merging upstream change