LPS-47428 Various XSS issues in 6.2.1 (Part 2)