LPS-39827 XSS vulnerability
LPS-39993 Let's fix the other one as well :-)
LPS-39810 Fix compile error