SONAR-3893 Added CR EOL support