main
Update sorting and grouping behavior (#55647)
Qualify type arguments based on scope context (#55697)