cherry-pick from master pr: #36318 commitId: c1999479 pr: #36111 commitId: 35ebef62 pr: #36175 commitId: 4c8e66b4 pr: #36414 commitId: 5e009b5a pr: #36770 commitId: 19e2126c pr: #36567 commitId: 3da83514