BugID: 94742 - Fixing OLD XSS vulnerability