PLFM-2824: portal side changes