Merge "Fix InternalServlet Vulenrabilities"