chore: cherry-pick remaining PRs into 2.22
#17851
+4,494
−1,137
Merged