[BUGFIX] Better support return carriage in export

Change-Id: Ie16f0619ef277fb341101ce94c34208922f00824
Releases: 0.4.0
Resolves: #59673