Integrated the JS injection prevention fix from the editor.