LPS-39308 move code above (no changes)
LPS-39308 pass already fetched object instead of obtaining it again (no logic changes)
LPS-39308 Use the appropriate groupId (this fixes the bug)