PLFM-2824: portal side changes
Merge pull request #1016 from jay-hodgson/PLFM-2824

PLFM-2824: portal side changes