## Proposed changes pick from #35652 #35701 #35864 #36368 #36789 #34970 Issue Number: close #xxx <!--Describe your changes.-->