Merge "Prevent attribution/ comments from getting cut off"