More line ending normalization (related to DS-1587)