3.4.x merge to main

[nickva]

Merge the two commits from 3.4.x to main.

The way this was generated:

$ git checkout -b 3.4.x-merge-to-main
Switched to a new branch '3.4.x-merge-to-main'

$ git rebase main
warning: skipped previously applied commit 84cad523e
warning: skipped previously applied commit ea8add932
warning: skipped previously applied commit 46ec0c82c
warning: skipped previously applied commit 27950e539
warning: skipped previously applied commit 106873ded
hint: use --reapply-cherry-picks to include skipped commits
hint: Disable this message with "git config advice.skippedCherryPicks false"
Successfully rebased and updated refs/heads/3.4.x-merge-to-main.

git successfully figured out the rebased commits were already applied except the two new ones.