LPS-41486

This fix depends on the portal fix for LPS-41486