refs #33549
refs #33548
Merge pull request #535 from aipocom/bugfix/portlet-customize2

Bugfix/portlet customize2