LPS-35167

Hi Julio,

this one should wait until Zsolt's LPS-35118 fix to add groupId condition only when the model is StagedGroupedModel

thanks,
Daniel