LPS-31986

Portal part of the fix. Hook will come soon