chore(grouping): Use optimized grouping logic for 20% of non-transiti…

chore(grouping): Use optimized grouping logic for 20% of non-transiti… #28039