Merge "Fix bugs with verify_trace." into main