Portal model changes and tests for  [#75226430]