Added attribute for colored canvas
Merge remote-tracking branch 'grid-team/master' into integration