Merge pull request #98716 from TaduJR/feat/90539-group-rows-derivation