fix #1153
Merge pull request #337 from jygaulier/3.7-fix1153

[3.7] Fix #1153
Remove extra comments
Fix #1155 Export CSV truncated
Merge pull request #338 from nlegoff/fix_report

[3.7] Fix #1155 Export CSV truncated
Fix CS