Merge "Fix Unwanted mid-word line break" into main