CB-3035 Fix issue with windows new line char \n\r