Please review branch feature/ZEN-8314_XSS_Fixes