LPS-44295 Apply in more portal cases