Merge branch 'jk/vreport-sanitize'