Merge "Avoid strings clipped" into main