Merge branch '91_canvas_paint_operations_optimization'