Merge "More informative trace names in repeatWhenAttached" into main