Merge "Normalize "\r" newlines in preSaveTransform"