LPS-45984 We should use groupId instead of companyId