Merge "Add trace point for line breaker" into main