LPS-43978 autogenerated

Thanks for your review, Mate! The changes make a lot of sense. I am going to resend you the pull because the JSP doesn't exist. Other than that, and the other question about permissions it should be fine. thanks!