LPS-35439 Upgrade layout friendly urls