LPS-22792 Refactored JSP