1.98 - fixed some reported cross-scripting holes
Authored by: ciprianmp 2020-06-10
Parent: [r679]
Child: [r681]