Today
merge from canvas_debug_command