Fixing XSS vulnerability
Merge branch 'bugid-94742' into dev