portal issue #3538 (#3580)