LPS-47589 Let's sort this. title first, then other *title
LPS-47589 I undid by accident earlier. Add it back
LPS-47589 Regen
LPS-47589 Fix broken upgrade