LPS-32488 Add portal property and fix several issues