Merge branch 'hotfix/dryrun-fix2'
Added escape characters on fieldnames
Merge branch 'hotfix/escapechara' into develop