Merge "XSS Vulnerability fix in SharedContextRestController"