Merge branch 'js/no-html-bypass-on-windows'