Merge "Fix conditionally-imbalanced traceEnd" into main