Merge "XSS Vulnerability fix in TicketEventController"