FS-6052 --resolve
FS-6052 line endings