Merge branch '91_canvas_merge_test' into 91_canvas_paint_operations_optimization