escape some output
Merge branch 'v1.5.3' into v1.5.4