SWC-1073:  Portal-side updates to utilize work done in PLFM-2248