REFACTORING: Edits on server prepared for mutualization.
FEATURE: Join lines (or units) to get bigger meaningful units.