Merge "Add flag for tracing" into main