Merge "An optimization for Pointer Location for drawing the trace" into main