Merge "Edit trace to start with "draw"" into main