LPS-37664 SF
LPS-36022 we should use the groupId (not the scopeGroupId) because otherwise it fails for company entities (site templates...etc)