Merge "Removing temporary debug tracing" into main