LPS-44263 Apply in more portal cases