Merge "Cleanup for TAPL Debugging" into main