Release: Merge patches to main
(without version bump)
#23905
version-patch-from-7.3.2% was force-pushed and no longer has any new commits.
Pushing new commits will allow the pull request to be re-opened.