Merge "XSS Vulnerability fix in PortalAdminController"