Merge change from develop branch for Canvas HTML5 binding
Merge from remote