main
This sync some of the changes we have on the main branch will allow more upcomming changes to land via a single PR. PR Close #63394