Daily "22.0 to master" sweep: 06/06/22

This is the manual sweep of MRs from the 22.0 branch to the master branch for 06/06/22.

No merge conflicts today - used git merge upstream/22.0