Escape data on output
Merge branch 'i45' into wip