LPS-50049 Refactor portal-impl pt.3