Merge branch 'master' into 91_canvas_paint_operations_optimization