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

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

No merge conflicts today - I've used git merge upstream/22.0