Merge pull request #26492 from 18alantom/bp-fix-item-group-portal-issues

fix: item group portal issues (backport)