Merge "XSS Vulnerability fix in MicroserviceController"