PRD-4841 - Handling of linebreaks in complex text: More fixes.