Merge "Add a verify_trace tool." into main